From 6a82eff87a751572b5a1e97439779a80eb79c501 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 7 Mar 2022 07:48:06 +0100 Subject: [PATCH 1/5] 16.6.6 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 4f120dd..ce56f63 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/jgraph/drawio/archive/v16.5.3.tar.gz -SOURCE_SUM=2ed630bc4bc8cfda6eab075aa29c8bd6aa849967ce4f4658e334ccf4463fdb1b +SOURCE_URL=https://github.com/jgraph/drawio/archive/v16.6.6.tar.gz +SOURCE_SUM=196b2d39a188f57a5a178f8db3913b3e9e96e9ddf1efb13f780d4095efc6984e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 551b513..25c7b71 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams", "fr": "Application en ligne qui permet de faire des schémas et du dessin vectoriel" }, - "version": "16.5.3~ynh1", + "version": "16.6.6~ynh1", "url": "https://www.diagrams.net/", "upstream": { "license": "Apache-2.0", From 16f36d83f4d5d123a9139190c1fdef110fdefa68 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 7 Mar 2022 06:48:15 +0000 Subject: [PATCH 2/5] 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 921d5a7..64a044a 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 Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams -**Shipped version:** 16.5.3~ynh1 +**Shipped version:** 16.6.6~ynh1 **Demo:** https://app.diagrams.net/ diff --git a/README_fr.md b/README_fr.md index f2b9fa8..4873d67 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Application en ligne qui permet de faire des schémas et du dessin vectoriel -**Version incluse :** 16.5.3~ynh1 +**Version incluse :** 16.6.6~ynh1 **Démo :** https://app.diagrams.net/ From 06276037da934849bc77387e7dc67eb3f2a14df9 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 9 Apr 2022 10:32:03 +0200 Subject: [PATCH 3/5] 17.4.2 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index ce56f63..dd1e573 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/jgraph/drawio/archive/v16.6.6.tar.gz -SOURCE_SUM=196b2d39a188f57a5a178f8db3913b3e9e96e9ddf1efb13f780d4095efc6984e +SOURCE_URL=https://github.com/jgraph/drawio/archive/v17.4.2.tar.gz +SOURCE_SUM=625f7d87da8d1df71545a8aac5250569e5f502f207c182a348e28a6a53a1fcfd SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 25c7b71..9b74836 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams", "fr": "Application en ligne qui permet de faire des schémas et du dessin vectoriel" }, - "version": "16.6.6~ynh1", + "version": "17.4.2~ynh1", "url": "https://www.diagrams.net/", "upstream": { "license": "Apache-2.0", From e29246275c46149a594b19942732883f3d758929 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 9 Apr 2022 08:32:10 +0000 Subject: [PATCH 4/5] 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 64a044a..5594633 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 Online diagram software for making flowcharts, process diagrams, org charts, UML, ER and network diagrams -**Shipped version:** 16.6.6~ynh1 +**Shipped version:** 17.4.2~ynh1 **Demo:** https://app.diagrams.net/ diff --git a/README_fr.md b/README_fr.md index 4873d67..82bd762 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Application en ligne qui permet de faire des schémas et du dessin vectoriel -**Version incluse :** 16.6.6~ynh1 +**Version incluse :** 17.4.2~ynh1 **Démo :** https://app.diagrams.net/ From f72963096ca4c11cb4c61d1eacd195c3817e76f1 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 10 Apr 2022 08:38:48 +0200 Subject: [PATCH 5/5] Create updater.sh --- .github/workflows/updater.sh | 133 +++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 .github/workflows/updater.sh diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh new file mode 100644 index 0000000..e356333 --- /dev/null +++ b/.github/workflows/updater.sh @@ -0,0 +1,133 @@ +#!/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. + +# Remove this exit command when you are ready to run this Action +exit 1 + +#================================================= +# 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. +# 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 + +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_FILENAME= +EOT +echo "... conf/$src.src updated" + +else +echo "... asset ignored" +fi + +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