From 8f460e5b2e6cfa1c9efe9900220a6b8de08d34d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 4 Oct 2021 22:47:35 +0200 Subject: [PATCH] Testing (#16) * 1.14.9 --- .DS_Store | Bin 0 -> 6148 bytes .github/workflows/updater.sh | 140 ++++++++++++++++++++++++++++++++++ .github/workflows/updater.yml | 49 ++++++++++++ README.md | 2 +- README_fr.md | 2 +- conf/app.src | 6 +- manifest.json | 5 +- 7 files changed, 196 insertions(+), 8 deletions(-) create mode 100644 .DS_Store create mode 100644 .github/workflows/updater.sh create mode 100644 .github/workflows/updater.yml diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..b5f9911dac78a8ffc8d9e67b686e5b6a6ca5830b GIT binary patch literal 6148 zcmeHK%}(1u5S|Tzcnd;Ckz*%^D3Zkk z@Br-<+Se$3ioQo*pfkH0RGRi!1ZYN@{l@dR_GfF?3jm^1h8qAj09dGmHHpJtgyN(# zQZpVxp?dV8gdi9V&Vyton;j340eW{0Scfx+p@84sUlw5GXK8=`Gtlh zpUEY;ESHYGem3$7zbFSCKkwPEy*P{lKR=AaqQ4)dyGb;R(!KnhUqtywO5V@11QWFF z2M2L9>e(-Lvb6ByG|E*!-Q(ymPQz@}$;vbwsC?60+3)?LkA37DH>wn)(vm%UWjt=K zIh(E4WX&13+h}jKwkH#5S+7>#emE&FE&TkRvL9V2sJbIF*6HuLJ?|q^gAjYgsYK9 zW`G&E%fOtzv}ym}{rCC*ZV_KG1I)maVnEcpUblmfWcJpXhoimLK|Mt!p}b1tZ3!A` iE5=;fieI8CLBB%=qHD0yh#nOF5l}Snzzp0g1HS;liDC8t literal 0 HcmV?d00001 diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh new file mode 100644 index 0000000..7fe0c09 --- /dev/null +++ b/.github/workflows/updater.sh @@ -0,0 +1,140 @@ +#!/bin/bash + +#================================================= +# PACKAGE UPDATING HELPER +#================================================= + +# 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. + +#================================================= +# 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 +# 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. + +count=0 + +# Let's loop over the array of assets URLs +for asset_url in ${assets[@]}; do + +echo "Handling asset at $asset_url" + +# 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 + *".tar.gz") + src="app" + ;; + *) + src="" + ;; +esac + +# If $src is not empty, let's process the asset +if [ ! -z "$src" ]; then + +# 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) + +# Delete temporary directory +rm -rf $tempdir + +# Get extension +if [[ $filename == *.tar.gz ]]; then + extension=tar.gz +else + extension=${filename##*.} +fi + +# 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_EXTRACT=true +SOURCE_FILENAME=mineweb.tar.gz +EOT +echo "... conf/$src.src updated" + +count=$((count+1)) + +else +echo "... asset ignored" +fi + +done + +if [ $count == 0 ]; then + echo "::warning ::None of the assets were processed." + exit 0 +fi + +#================================================= +# 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 new file mode 100644 index 0000000..fd6ed60 --- /dev/null +++ b/.github/workflows/updater.yml @@ -0,0 +1,49 @@ +# 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: + - name: Fetch the source code + uses: actions/checkout@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + - 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 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@v3 + with: + token: ${{ secrets.GITHUB_TOKEN }} + commit-message: Update to version ${{ env.VERSION }} + committer: 'yunohost-bot ' + author: 'yunohost-bot ' + signoff: false + branch: ci-auto-update-v${{ env.VERSION }} + base: testing + delete-branch: true + title: 'Upgrade to version ${{ env.VERSION }}' + body: | + Upgrade to v${{ env.VERSION }} + draft: false diff --git a/README.md b/README.md index ff9e0b6..c8e80f6 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ MineWeb est un CMS (c'est-à-dire un système de gestion de contenu), en plus si Vous pourrez tenir vos joueurs au courant des actualités, leur faire acheter des articles sur la boutique... Vous pourrez personnaliser le CMS avec toutes sortes de thèmes ou plugins ! Ceux-ci sont disponibles sur le market ou peuvent être développés par vous-même. -**Shipped version:** 1.14.5~ynh1 +**Shipped version:** 1.14.9~ynh1 diff --git a/README_fr.md b/README_fr.md index a25c9f6..6c91f12 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ MineWeb est un CMS (c'est-à-dire un système de gestion de contenu), en plus si Vous pourrez tenir vos joueurs au courant des actualités, leur faire acheter des articles sur la boutique... Vous pourrez personnaliser le CMS avec toutes sortes de thèmes ou plugins ! Ceux-ci sont disponibles sur le market ou peuvent être développés par vous-même. -**Version incluse :** 1.14.5~ynh1 +**Version incluse :** 1.14.9~ynh1 diff --git a/conf/app.src b/conf/app.src index 8084a93..c9423fb 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/MineWeb/MineWebCMS/archive/v1.14.5.tar.gz -SOURCE_SUM=60d70179aafc30f29d18218cd24d772c367e5644cf8fa5a3d8e18fcded21aad1 +SOURCE_URL=https://github.com/MineWeb/MineWebCMS/archive/v1.14.9.tar.gz +SOURCE_SUM=5f2e180a466668c5e940610e3ad1abb0282f14b8d5ff41df95ab86123e62fcbf SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_EXTRACT=true -SOURCE_FILENAME=mineweb.tar.gz \ No newline at end of file +SOURCE_FILENAME=mineweb.tar.gz diff --git a/manifest.json b/manifest.json index cb78fd3..a3bbf8d 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Customizable and intuitive CMS", "fr": "CMS personnalisable et intuitif" }, - "version": "1.14.5~ynh1", + "version": "1.14.9~ynh1", "url": "https://mineweb.org/", "upstream": { "license": "AGPL-3.0-only", @@ -31,8 +31,7 @@ "arguments": { "install": [{ "name": "domain", - "type": "domain", - "example": "example.com" + "type": "domain" }, { "name": "path",