From 8aae82f80d7bdc99e0f44170638098e1671c0d69 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 6 Oct 2022 06:17:48 +0000 Subject: [PATCH 01/12] Upgrade to v1.7.37.1 --- conf/app-upgrade.src | 4 ++-- conf/app.src | 4 ++-- manifest.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conf/app-upgrade.src b/conf/app-upgrade.src index 6e3607b..3e2a9e8 100644 --- a/conf/app-upgrade.src +++ b/conf/app-upgrade.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.7.36/grav-update-v1.7.36.zip -SOURCE_SUM=d541e945f16e4cfdba3456952ebbaea7ba458ab3fae472275dc39309b1c69a07 +SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.7.37.1/grav-update-v1.7.37.1.zip +SOURCE_SUM=a984c67052b9300f20a5b3fbe47ba373d56c2081b0f2ceb77f56bd793ea7e09b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/app.src b/conf/app.src index 4e4deac..d5b9873 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.7.36/grav-admin-v1.7.36.zip -SOURCE_SUM=6f916a7d6ca1b44ceb4844516cfacba9e5a1c733c4bc1cb00148a1de70e6e70e +SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.7.37.1/grav-admin-v1.7.37.1.zip +SOURCE_SUM=da73aea19d6b9fe0427c8b87cbf1b58a9e87f5c9f167eb76d5f9322d3d642b0d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 59b3d02..a8ddc99 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A modern open source flat-file CMS", "fr": "Un CMS moderne basé sur des fichiers plats" }, - "version": "1.7.36~ynh1", + "version": "1.7.37.1~ynh1", "url": "https://www.getgrav.org/", "upstream": { "license": "MIT", From 9ff1e86a1cd5967c95d93bc9c867f5e1463cdfce Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 6 Oct 2022 06:17:53 +0000 Subject: [PATCH 02/12] 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 656407e..dd576fd 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in A modern open source flat-file CMS -**Shipped version:** 1.7.36~ynh1 +**Shipped version:** 1.7.37.1~ynh1 *(:warning: This is the `ci-auto-update-v1.7.37.1` branch. The [`master` branch](https://github.com/YunoHost-Apps/grav_ynh/tree/master) used in the catalog is currently on version 1.7.36\~ynh1.)* **Demo:** https://getgrav.org/downloads/themes diff --git a/README_fr.md b/README_fr.md index 26d4039..08f5adc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Un CMS moderne basé sur des fichiers plats -**Version incluse :** 1.7.36~ynh1 +**Version incluse :** 1.7.37.1~ynh1 *(:warning: Il s'agit de la branche `ci-auto-update-v1.7.37.1`. La [branche `master`](https://github.com/YunoHost-Apps/grav_ynh/tree/master) utilisée dans le catalogue est actuellement en 1.7.36\~ynh1.)* **Démo :** https://getgrav.org/downloads/themes From 057d89db789070c625006d59bba535d62d5f75ba Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 21 Dec 2022 14:20:25 +0000 Subject: [PATCH 03/12] Auto-update README --- README.md | 2 +- README_fr.md | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5792421..7d99400 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 Grav is a modern open source flat-file CMS. -**Shipped version:** 1.7.37.1~ynh1 *(:warning: This is the `ci-auto-update-v1.7.37.1` branch. The [`master` branch](https://github.com/YunoHost-Apps/grav_ynh/tree/master) used in the catalog is currently on version 1.7.36\~ynh1.)* +**Shipped version:** 1.7.37.1~ynh1 **Demo:** https://getgrav.org/downloads/themes diff --git a/README_fr.md b/README_fr.md index 281eb40..ba4dda3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Un CMS moderne basé sur des fichiers plats -**Version incluse :** 1.7.36~ynh1 + +**Version incluse :** 1.7.37.1~ynh1 **Démo :** https://getgrav.org/downloads/themes From dc9592f35c4d2a10fd00a5d8c27efac11a43fa21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sat, 24 Dec 2022 22:05:26 +0100 Subject: [PATCH 04/12] Fix shasum --- conf/app.src | 2 +- conf/ldap.src | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 2e25814..7871cc9 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ SOURCE_URL=https://github.com/getgrav/grav/releases/download/1.7.37.1/grav-admin-v1.7.37.1.zip -SOURCE_SUM=da73aea19d6b9fe0427c8b87cbf1b58a9e87f5c9f167eb76d5f9322d3d642b0d +SOURCE_SUM=5ac880b8ffe0dae89ceaafe2c404aac057faf8e761d736321029d17c833ab301 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true diff --git a/conf/ldap.src b/conf/ldap.src index 47d0af7..563e3a0 100644 --- a/conf/ldap.src +++ b/conf/ldap.src @@ -1,5 +1,5 @@ SOURCE_URL=https://github.com/trilbymedia/grav-plugin-login-ldap/archive/refs/tags/1.0.2.zip -SOURCE_SUM=BDAEA681730E800AB8EDA7EDF56D772BACA1DE783D0F8C321AC2EC86D82628CA +SOURCE_SUM=bdaea681730e800ab8eda7edf56d772baca1de783d0f8c321ac2ec86d82628ca SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true From fef696346538a94b988221c1940306046817d347 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Thu, 23 Feb 2023 23:34:53 +0100 Subject: [PATCH 05/12] [autopatch] Upgrade auto-updater --- .github/workflows/updater.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index f040046..f69f8dc 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -7,7 +7,7 @@ jobs: updater: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - name: Check if newer version is available upstream @@ -46,12 +46,12 @@ jobs: # Run the version updater script ./.github/workflows/updater.sh # Replace new version in manifest - jq -s --indent 4 ".[] | .version = \"$VERSION~ynh1\"" manifest.json | sponge manifest.json + jq -s --indent 4 ".[] | .version = "$VERSION~ynh1"" manifest.json | sponge manifest.json # Commit git commit -am "Upgrade to v$VERSION" - name: Create Pull Request id: cpr - uses: peter-evans/create-pull-request@v3 + uses: peter-evans/create-pull-request@v4 if: steps.check_version.outputs.to_update == 'true' with: token: ${{ secrets.GITHUB_TOKEN }} From d7302c1994a1224a92c488e90fd39dc7d27145f3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 23 Feb 2023 22:34:55 +0000 Subject: [PATCH 06/12] Auto-update README --- README.md | 3 ++- README_fr.md | 21 +++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index c5a9e11..0922108 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,8 @@ It shall NOT be edited by hand. # Grav for YunoHost -[![Integration level](https://dash.yunohost.org/integration/grav.svg)](https://dash.yunohost.org/appci/app/grav) ![Working status](https://ci-apps.yunohost.org/ci/badges/grav.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/grav.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/grav.svg)](https://dash.yunohost.org/appci/app/grav) ![Working status](https://ci-apps.yunohost.org/ci/badges/grav.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/grav.maintain.svg) + [![Install Grav with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grav) *[Lire ce readme en français.](./README_fr.md)* diff --git a/README_fr.md b/README_fr.md index 3845e91..395f6a3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,15 +5,16 @@ It shall NOT be edited by hand. # Grav pour YunoHost -[![Niveau d'intégration](https://dash.yunohost.org/integration/grav.svg)](https://dash.yunohost.org/appci/app/grav) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/grav.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/grav.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/grav.svg)](https://dash.yunohost.org/appci/app/grav) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/grav.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/grav.maintain.svg) + [![Installer Grav avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=grav) *[Read this readme in english.](./README.md)* -> *Ce package vous permet d'installer Grav rapidement et simplement sur un serveur YunoHost. -Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.* +> *Ce package vous permet d’installer Grav rapidement et simplement sur un serveur YunoHost. +Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* -## Vue d'ensemble +## Vue d’ensemble Un CMS moderne basé sur des fichiers plats @@ -22,9 +23,9 @@ Un CMS moderne basé sur des fichiers plats **Démo :** https://getgrav.org/downloads/themes -## Captures d'écran +## Captures d’écran -![Capture d'écran de Grav](./doc/screenshots/grav.jpg) +![Capture d’écran de Grav](./doc/screenshots/grav.jpg) ## Avertissements / informations importantes @@ -40,9 +41,9 @@ Un CMS moderne basé sur des fichiers plats ## Documentations et ressources -* Site officiel de l'app : -* Documentation officielle de l'admin : -* Dépôt de code officiel de l'app : +* Site officiel de l’app : +* Documentation officielle de l’admin : +* Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : @@ -58,4 +59,4 @@ ou sudo yunohost app upgrade grav -u https://github.com/YunoHost-Apps/grav_ynh/tree/testing --debug ``` -**Plus d'infos sur le packaging d'applications :** +**Plus d’infos sur le packaging d’applications :** \ No newline at end of file From 3f6c4babc10d8c1cce52ed27ce30bb567a825bc4 Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 5 Mar 2023 19:38:21 +0100 Subject: [PATCH 07/12] Upgrade auto-updater --- .github/workflows/updater.sh | 160 +++++++++++++++++++++++----------- .github/workflows/updater.yml | 61 ++++--------- 2 files changed, 129 insertions(+), 92 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 386be22..32dce5e 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -1,74 +1,134 @@ #!/bin/bash -############################# -# PACKAGE UPDATING HELPER # -############################# +#================================================= +# PACKAGE UPDATING HELPER +#================================================= -# This script is meant to be run by GitHub actions: check .github/workflows/updater.yml -# Since each app is different, maintainers can adapt its contents -# so as to perform automatic actions when a new upstream release is detected. +# This script is meant to be run by GitHub Actions +# The YunoHost-Apps organisation offers a template Action to run this script periodically +# Since each app is different, maintainers can adapt its contents so as to perform +# automatic actions when a new upstream release is detected. -# The ASSETS environment variable is a space-separated list of urls -# of assets published with the latest upstream release. -# Let's convert it into an array. -eval "ASSETS=($ASSETS)" -echo "${#ASSETS[@]} available asset(s)" +#================================================= +# FETCHING LATEST RELEASE AND ITS ASSETS +#================================================= + +# Fetching information +current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') +repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') +# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) +version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1) +assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) + +# Later down the script, we assume the version has only digits and dots +# Sometimes the release name starts with a "v", so let's filter it out. +# You may need more tweaks here if the upstream repository has different naming conventions. +if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then + version=${version:1} +fi + +# Setting up the environment variables +echo "Current version: $current_version" +echo "Latest release from upstream: $version" +echo "VERSION=$version" >> $GITHUB_ENV +echo "REPO=$repo" >> $GITHUB_ENV +# For the time being, let's assume the script will fail +echo "PROCEED=false" >> $GITHUB_ENV + +# Proceed only if the retrieved version is greater than the current one +if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then + echo "::warning ::No new version available" + exit 0 +# Proceed only if a PR for this new version does not already exist +elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then + echo "::warning ::A branch already exists for this update" + exit 0 +fi + +# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) +echo "${#assets[@]} available asset(s)" + +#================================================= +# UPDATE SOURCE FILES +#================================================= + +# Here we use the $assets variable to get the resources published in the upstream release. +# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like. # Let's loop over the array of assets URLs -for asset_url in ${ASSETS[@]}; do +for asset_url in ${assets[@]}; do - echo "Handling asset at $asset_url" +echo "Handling asset at $asset_url" - # Assign the asset to a source file in conf/ directory - # Leave $src empty to ignore the asset - case $asset_url in - *"admin"*) - src="app" - ;; - *"update"*) - src="app-upgrade" - ;; - *) - src="" - ;; - esac +# Assign the asset to a source file in conf/ directory +# Here we base the source file name upon a unique keyword in the assets url (admin vs. update) +# Leave $src empty to ignore the asset +case $asset_url in + *"admin"*) + src="app" + ;; + *"update"*) + src="app-upgrade" + ;; + *) + src="" + ;; +esac - # If $src is not empty, let's process the asset - if [ ! -z "$src" ]; then +# If $src is not empty, let's process the asset +if [ ! -z "$src" ]; then - # Create the temporary directory - tempdir="$(mktemp -d)" +# Create the temporary directory +tempdir="$(mktemp -d)" - # Download sources and calculate checksum - filename=${asset_url##*/} - curl --silent -4 -L $asset_url -o "$tempdir/$filename" - checksum=$(sha256sum "$tempdir/$filename" | head -c 64) +# Download sources and calculate checksum +filename=${asset_url##*/} +curl --silent -4 -L $asset_url -o "$tempdir/$filename" +checksum=$(sha256sum "$tempdir/$filename" | head -c 64) - # Delete temporary directory - rm -rf $tempdir +# Delete temporary directory +rm -rf $tempdir - # Get extension - if [[ $filename == *.tar.gz ]]; then - extension=tar.gz - else - extension=${filename##*.} - fi +# Get extension +if [[ $filename == *.tar.gz ]]; then + extension=tar.gz +else + extension=${filename##*.} +fi - # Rewrite source file - cat < conf/$src.src +# Rewrite source file +cat < conf/$src.src SOURCE_URL=$asset_url SOURCE_SUM=$checksum SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=$extension SOURCE_IN_SUBDIR=true SOURCE_FILENAME= -SOURCE_EXTRACT=true EOT - echo "... conf/$src.src updated" +echo "... conf/$src.src updated" - else - echo "... asset ignored" - fi +else +echo "... asset ignored" +fi done -echo "Done!" + +#================================================= +# SPECIFIC UPDATE STEPS +#================================================= + +# Any action on the app's source code can be done. +# The GitHub Action workflow takes care of committing all changes after this script ends. + +#================================================= +# GENERIC FINALIZATION +#================================================= + +# Replace new version in manifest +echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json + +# No need to update the README, yunohost-bot takes care of it + +# The Action will proceed only if the PROCEED environment variable is set to true +echo "PROCEED=true" >> $GITHUB_ENV +exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index f69f8dc..4a866ff 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -1,73 +1,50 @@ +# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. +# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. +# This file should be enough by itself, but feel free to tune it to your needs. +# It calls updater.sh, which is where you should put the app-specific update steps. name: Check for new upstream releases on: + # Allow to manually trigger the workflow workflow_dispatch: + # Run it every day at 6:00 UTC schedule: - cron: '0 6 * * *' jobs: updater: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Fetch the source code + uses: actions/checkout@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - - name: Check if newer version is available upstream - id: check_version - run: | - # Install moreutils - sudo apt-get install moreutils - # Fetching information - current_version=$(cat manifest.json | jq -j '.version|split("~")[0]') - repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]') - version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | .tag_name' | sort -V | tail -1) - assets=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'") - # Setting up the environment variables - echo ::set-output name=current_version::$current_version - echo "Current version: $current_version" - echo ::set-output name=latest_version::$version - echo "Latest release from upstream: $version" - echo "VERSION=$version" >> $GITHUB_ENV - echo "ASSETS=$assets" >> $GITHUB_ENV - if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo ::set-output name=to_update::false - echo "::warning ::No new version available" - elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo ::set-output name=to_update::false - echo "::warning ::A branch already exists for that" - else - echo ::set-output name=to_update::true - fi - - name: Update package files - id: update_files - if: steps.check_version.outputs.to_update == 'true' + - name: Run the updater script + id: run_updater run: | # Setting up Git user git config --global user.name 'yunohost-bot' git config --global user.email 'yunohost-bot@users.noreply.github.com' - # Run the version updater script - ./.github/workflows/updater.sh - # Replace new version in manifest - jq -s --indent 4 ".[] | .version = "$VERSION~ynh1"" manifest.json | sponge manifest.json - # Commit + # Run the updater script + /bin/bash .github/workflows/updater.sh + - name: Commit changes + id: commit + if: ${{ env.PROCEED == 'true' }} + run: | git commit -am "Upgrade to v$VERSION" - name: Create Pull Request id: cpr + if: ${{ env.PROCEED == 'true' }} uses: peter-evans/create-pull-request@v4 - if: steps.check_version.outputs.to_update == 'true' with: token: ${{ secrets.GITHUB_TOKEN }} commit-message: Update to version ${{ env.VERSION }} committer: 'yunohost-bot ' author: 'yunohost-bot ' signoff: false + base: testing branch: ci-auto-update-v${{ env.VERSION }} delete-branch: true title: 'Upgrade to version ${{ env.VERSION }}' body: | Upgrade to v${{ env.VERSION }} + [See upstream release page](https://github.com/${{ env.REPO }}/releases/tag/v${{ env.VERSION }}) draft: false - - name: Check outputs - run: | - echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}" - echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" - echo "Current version - ${{ steps.check_version.outputs.current_version }}" - echo "New version - ${{ steps.check_version.outputs.latest_version }}" From 487c9d04b46d7672c8fa5169cec9602dfb2c293e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 5 Mar 2023 19:42:04 +0100 Subject: [PATCH 08/12] Update manifest.json --- manifest.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 75fb3e0..b4f6668 100644 --- a/manifest.json +++ b/manifest.json @@ -3,10 +3,10 @@ "id": "grav", "packaging_format": 1, "description": { - "en": "A modern open source flat-file CMS", - "fr": "Un CMS moderne basé sur des fichiers plats" + "en": "Modern open source flat-file CMS", + "fr": "CMS moderne basé sur des fichiers plats" }, - "version": "1.7.38~ynh1", + "version": "1.7.38~ynh2", "url": "https://www.getgrav.org/", "upstream": { "license": "MIT", From 436f459695820ebce10f510cda2e1dddc8326aa1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 5 Mar 2023 18:42:08 +0000 Subject: [PATCH 09/12] 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 0922108..55a1ba9 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Grav is a modern open source flat-file CMS. -**Shipped version:** 1.7.38~ynh1 +**Shipped version:** 1.7.38~ynh2 **Demo:** https://getgrav.org/downloads/themes diff --git a/README_fr.md b/README_fr.md index 395f6a3..a3f8d4d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Un CMS moderne basé sur des fichiers plats -**Version incluse :** 1.7.38~ynh1 +**Version incluse :** 1.7.38~ynh2 **Démo :** https://getgrav.org/downloads/themes From dc884ac9c53b65c49be233d3159669caa21567bc Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 5 Mar 2023 19:44:33 +0100 Subject: [PATCH 10/12] Add changelog to auto-updater --- .github/workflows/updater.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml index 4a866ff..e30ee45 100644 --- a/.github/workflows/updater.yml +++ b/.github/workflows/updater.yml @@ -46,5 +46,5 @@ jobs: title: 'Upgrade to version ${{ env.VERSION }}' body: | Upgrade to v${{ env.VERSION }} - [See upstream release page](https://github.com/${{ env.REPO }}/releases/tag/v${{ env.VERSION }}) + [See CHANGELOG](https://github.com/${{ env.REPO }}/blob/${{ env.VERSION }}/CHANGELOG.md) draft: false From d6c3fd0b26fb444aca34e84a8654ba23464aa950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 5 Mar 2023 19:44:52 +0100 Subject: [PATCH 11/12] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 2678db1..2504bff 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Modern open source flat-file CMS", "fr": "CMS moderne basé sur des fichiers plats" }, - "version": "1.7.39.4~ynh1", + "version": "1.7.39.4~ynh2", "url": "https://www.getgrav.org/", "upstream": { "license": "MIT", From af79eb59edd23494c73fb7d3b67a85cf3902fcec Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 5 Mar 2023 18:45:02 +0000 Subject: [PATCH 12/12] 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 f5928e3..465d775 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Grav is a modern open source flat-file CMS. -**Shipped version:** 1.7.39.4~ynh1 +**Shipped version:** 1.7.39.4~ynh2 **Demo:** https://getgrav.org/downloads/themes diff --git a/README_fr.md b/README_fr.md index 3d00490..91fde59 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Un CMS moderne basé sur des fichiers plats -**Version incluse :** 1.7.39.4~ynh1 +**Version incluse :** 1.7.39.4~ynh2 **Démo :** https://getgrav.org/downloads/themes