From 58c5b870920866a4f4b28848973054f9fa9431db Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 19 Mar 2023 21:30:20 +0100 Subject: [PATCH 1/3] Fix auto-updater --- .github/workflows/updater.sh | 6 +++--- .github/workflows/updater.yml | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 9778395..5e34d44 100644 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -14,9 +14,9 @@ #================================================= # 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) -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" # 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. @@ -104,7 +104,7 @@ echo "scripts/_common.sh patched" #================================================= # 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 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 609c284..d997959 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -23,6 +23,8 @@ jobs: # Setting up Git user git config --global user.name 'yunohost-bot' git config --global user.email 'yunohost-bot@users.noreply.github.com' + # Download yq/tomlq + pip install yq # Run the updater script /bin/bash .github/workflows/updater.sh - name: Commit changes From 36061125979ef74129764acfd3ac4f25ff58b72b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 19 Mar 2023 20:31:44 +0000 Subject: [PATCH 2/3] Upgrade to v1.7.1 --- conf/app.src | 4 ++-- manifest.toml | 2 +- scripts/_common.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index 0728e9b..b22d65d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/flarum/flarum/archive/v1.6.0.zip -SOURCE_SUM=ecd6d5adc9aebc254b9e8903361517dcb00cd2d36c008a7efedd88ba209acb7b +SOURCE_URL=https://github.com/flarum/flarum/archive/v1.7.0.zip +SOURCE_SUM=f7ab347c22acf1516724368d2f2f9728f8b621f742e049a031c0fd6f61120392 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.toml b/manifest.toml index f8b2bde..52311df 100644 --- a/manifest.toml +++ b/manifest.toml @@ -6,7 +6,7 @@ description.en = "Next-generation forum made simple" description.fr = "Forum de nouvelle génération, simplement" description.de = "Forum der nächsten Generation leicht gemacht" -version = "1.6.3~ynh2" +version = "1.7.1~ynh1" maintainers = ["tituspijean"] diff --git a/scripts/_common.sh b/scripts/_common.sh index d03cf0b..c268cef 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -8,7 +8,7 @@ swap_needed=1024 YNH_COMPOSER_VERSION="2.0.13" # Version numbers -project_version="1.6.0" +project_version="1.7.0" #core_version is now retrieved from the manifest ldap_version="*" From 1cd818a92f24cc8e7255bac6381a0a0e9bb7d4c7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 19 Mar 2023 20:31:48 +0000 Subject: [PATCH 3/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 58c76f5..ba8744a 100644 --- a/README.md +++ b/README.md @@ -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. -**Shipped version:** 1.6.3~ynh2 +**Shipped version:** 1.7.1~ynh1 **Demo:** https://discuss.flarum.org/d/21101-demos-come-to-flarum diff --git a/README_fr.md b/README_fr.md index dff0425..eba3eff 100644 --- a/README_fr.md +++ b/README_fr.md @@ -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é. -**Version incluse :** 1.6.3~ynh2 +**Version incluse :** 1.7.1~ynh1 **Démo :** https://discuss.flarum.org/d/21101-demos-come-to-flarum