YunoHost-Apps/flarum_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/flarum_ynh.git synced 2024-09-03 18:36:24 +02:00
Code Issues Activity Actions

Merge pull request #213 from YunoHost-Apps/testing

Browse source 
Fix auto-updater and upgrade to v1.7.1
This commit is contained in:
tituspijean 2023-03-23 18:29:38 +01:00 • committed by GitHub
commit 02bc3551de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.github/workflows/updater.sh vendored
View file

@ -14,9 +14,9 @@
#================================================= #=================================================
# Fetching information # Fetching information
current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') current_version=$(cat manifest.toml | tomlq -r '.version|split("~")[0]')
current_project_version=$(grep -Po 'project_version="\K[^"]*' scripts/_common.sh) current_project_version=$(grep -Po 'project_version="\K[^"]*' scripts/_common.sh)
core_repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') core_repo=$(cat manifest.toml | tomlq -r '.upstream.code|split("https://github.com/")[1]')
project_repo="flarum/flarum" project_repo="flarum/flarum"
# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) # Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions)
# Core version may be higher than project version, and we actually download the project then perform Composer install. # Core version may be higher than project version, and we actually download the project then perform Composer install.
@ -104,7 +104,7 @@ echo "scripts/_common.sh patched"
#================================================= #=================================================
# Replace new version in manifest # Replace new version in manifest
echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json sed -i "/version =/c\version = \"$version~ynh1\"" manifest.toml
# No need to update the README, yunohost-bot takes care of it # No need to update the README, yunohost-bot takes care of it

2
.github/workflows/updater.yml vendored
View file

@ -23,6 +23,8 @@ jobs:
# Setting up Git user # Setting up Git user
git config --global user.name 'yunohost-bot' git config --global user.name 'yunohost-bot'
git config --global user.email 'yunohost-bot@users.noreply.github.com' git config --global user.email 'yunohost-bot@users.noreply.github.com'
# Download yq/tomlq
pip install yq
# Run the updater script # Run the updater script
/bin/bash .github/workflows/updater.sh /bin/bash .github/workflows/updater.sh
- name: Commit changes - name: Commit changes

2
README.md
View file

@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
Flarum is a simple discussion platform for your website. It's fast and easy to use, with all the features you need to run a successful community. Flarum is a simple discussion platform for your website. It's fast and easy to use, with all the features you need to run a successful community.
**Shipped version:** 1.6.3~ynh2 **Shipped version:** 1.7.1~ynh1
**Demo:** https://discuss.flarum.org/d/21101-demos-come-to-flarum **Demo:** https://discuss.flarum.org/d/21101-demos-come-to-flarum

2
README_fr.md
View file

@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
Flarum est une plate-forme de discussion simple pour votre site Web. C'est rapide et facile à utiliser, avec toutes les fonctionnalités dont vous avez besoin pour gérer une communauté. Flarum est une plate-forme de discussion simple pour votre site Web. C'est rapide et facile à utiliser, avec toutes les fonctionnalités dont vous avez besoin pour gérer une communauté.
**Version incluse :** 1.6.3~ynh2 **Version incluse :** 1.7.1~ynh1
**Démo :** https://discuss.flarum.org/d/21101-demos-come-to-flarum **Démo :** https://discuss.flarum.org/d/21101-demos-come-to-flarum

4
conf/app.src
View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/flarum/flarum/archive/v1.6.0.zip SOURCE_URL=https://github.com/flarum/flarum/archive/v1.7.0.zip
SOURCE_SUM=ecd6d5adc9aebc254b9e8903361517dcb00cd2d36c008a7efedd88ba209acb7b SOURCE_SUM=f7ab347c22acf1516724368d2f2f9728f8b621f742e049a031c0fd6f61120392
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=zip SOURCE_FORMAT=zip
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

2
manifest.toml
View file

@ -6,7 +6,7 @@ description.en = "Next-generation forum made simple"
description.fr = "Forum de nouvelle génération, simplement" description.fr = "Forum de nouvelle génération, simplement"
description.de = "Forum der nächsten Generation leicht gemacht" description.de = "Forum der nächsten Generation leicht gemacht"
version = "1.6.3~ynh2" version = "1.7.1~ynh1"
maintainers = ["tituspijean"] maintainers = ["tituspijean"]

2
scripts/_common.sh
View file

@ -8,7 +8,7 @@ swap_needed=1024
YNH_COMPOSER_VERSION="2.0.13" YNH_COMPOSER_VERSION="2.0.13"
# Version numbers # Version numbers
project_version="1.6.0" project_version="1.7.0"
#core_version is now retrieved from the manifest #core_version is now retrieved from the manifest
ldap_version="*" ldap_version="*"