diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 4ab9446..b8b9e89 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -21,7 +21,8 @@ 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 "'")) +#assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'")) +asset_url=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select(.tag_name=="'$version'").tarball_url') # 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. @@ -48,7 +49,7 @@ elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY. fi # Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) -echo "${#assets[@]} available asset(s)" +#echo "${#assets[@]} available asset(s)" #================================================= # UPDATE SOURCE FILES @@ -58,21 +59,11 @@ echo "${#assets[@]} available asset(s)" # 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" -# 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 - "v"*".tar.gz") - src="app" - ;; - *) - src="" - ;; -esac +src="app" # If $src is not empty, let's process the asset if [ ! -z "$src" ]; then diff --git a/README.md b/README.md index 7633248..f3c3cf0 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:** 18.0.1~ynh1 +**Shipped version:** 18.0.2~ynh1 **Demo:** https://app.diagrams.net/ diff --git a/README_fr.md b/README_fr.md index 4954b09..f3fb80e 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 :** 18.0.1~ynh1 +**Version incluse :** 18.0.2~ynh1 **Démo :** https://app.diagrams.net/ diff --git a/conf/app.src b/conf/app.src index 3dbc282..0f2d50a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/jgraph/drawio/archive/v18.0.1.tar.gz -SOURCE_SUM=9d9cf798cdf377e5beb50707bbedf8f593cf8cbf064afe2c874c00fbbc60587f +SOURCE_URL=https://github.com/jgraph/drawio/archive/v18.0.2.tar.gz +SOURCE_SUM=00c9508997e8aeea1d91d928d6108d321e864786529ac92c0599ca6e0de2306e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index f06a7d7..05fa12f 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": "18.0.1~ynh1", + "version": "18.0.2~ynh1", "url": "https://www.diagrams.net/", "upstream": { "license": "Apache-2.0",