From 0cd8a54e0f33204d5351f5566e003fca4f784e07 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Mon, 21 Aug 2023 17:48:07 +0200 Subject: [PATCH 1/8] fix website link --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index f70b7e4..59c10d2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -11,7 +11,7 @@ maintainers = ["eric_G"] [upstream] license = "Apache-2.0" -website = "https://matrix.org/docs/projects/client/hydrogen" +website = "https://matrix.org/ecosystem/clients/hydrogen/" demo = "https://hydrogen.element.io/" code = "https://github.com/vector-im/hydrogen-web" From 2151e804a85379ce7cec1593172d852a313e4fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Mon, 21 Aug 2023 18:15:29 +0200 Subject: [PATCH 2/8] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index f70b7e4..59c10d2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -11,7 +11,7 @@ maintainers = ["eric_G"] [upstream] license = "Apache-2.0" -website = "https://matrix.org/docs/projects/client/hydrogen" +website = "https://matrix.org/ecosystem/clients/hydrogen/" demo = "https://hydrogen.element.io/" code = "https://github.com/vector-im/hydrogen-web" From be2257505a4ba38d36cb4e049dc458c0b09ad043 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 21 Aug 2023 16:15:33 +0000 Subject: [PATCH 3/8] 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 950d910..68b8cf0 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ A minimal Matrix chat client, focused on performance, offline functionality, and ## Documentation and resources -* Official app website: +* Official app website: * Upstream app code repository: * YunoHost documentation for this app: * Report a bug: diff --git a/README_fr.md b/README_fr.md index d410498..9dc03fd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -35,7 +35,7 @@ Un client de chat Matrix minimal, axé sur les performances, les fonctionnalité ## Documentations et ressources -* Site officiel de l’app : +* Site officiel de l’app : * Dépôt de code officiel de l’app : * Documentation YunoHost pour cette app : * Signaler un bug : From 38e73b946e0d103b5d31406ac71171041c3862a1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 4 Sep 2023 19:04:26 +0200 Subject: [PATCH 4/8] Upgrade to v0.4.1 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 59c10d2..751789d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Hydrogen" description.en = "Web client for Matrix" description.fr = "Client web pour Matrix" -version = "0.4.0~ynh1" +version = "0.4.1~ynh1" maintainers = ["eric_G"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/vector-im/hydrogen-web/releases/download/v0.4.0/hydrogen-web-0.4.0.tar.gz" - sha256 = "f9fbc4a03446dd9c41b88dfbf0f93239e5ee524516751b909325d7c617b7dbfa" + url = "https://github.com/vector-im/hydrogen-web/archive/refs/tags/v0.4.1.tar.gz" + sha256 = "a62e7758ebb76b3ac2f1c513c360b0815f0a7568466b90e557268d20d3f37c57" autoupdate.strategy = "latest_github_tag" [resources.ports] From da84630df6caa5df1b54867bb40a474a3c4ccf59 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 4 Sep 2023 17:04:29 +0000 Subject: [PATCH 5/8] 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 68b8cf0..5030eab 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ A minimal Matrix chat client, focused on performance, offline functionality, and - Loading (unused) parts of the application after initial page load should be supported -**Shipped version:** 0.4.0~ynh1 +**Shipped version:** 0.4.1~ynh1 **Demo:** https://hydrogen.element.io/ diff --git a/README_fr.md b/README_fr.md index 9dc03fd..9ef41be 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,7 @@ Un client de chat Matrix minimal, axé sur les performances, les fonctionnalité - Il s'agit d'une application Web autonome, mais elle peut également être facilement intégrée à un site Web/une application Web existante pour ajouter des fonctionnalités de chat. - Le chargement de parties (inutilisées) de l'application après le chargement initial de la page doit être pris en charge -**Version incluse :** 0.4.0~ynh1 +**Version incluse :** 0.4.1~ynh1 **Démo :** https://hydrogen.element.io/ From b91dfb0a69e4c749046608fb69f8a8b3aa70204d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 5 Oct 2023 11:54:51 +0200 Subject: [PATCH 6/8] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 751789d..78e0f56 100644 --- a/manifest.toml +++ b/manifest.toml @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/vector-im/hydrogen-web/archive/refs/tags/v0.4.1.tar.gz" - sha256 = "a62e7758ebb76b3ac2f1c513c360b0815f0a7568466b90e557268d20d3f37c57" + url = "https://github.com/vector-im/hydrogen-web/releases/download/v0.4.1/hydrogen-web-0.4.1.tar.gz" + sha256 = "b4ba42a13b5cec1e447408959f2f9dc00df431a68b3e457c569fd1d0bad8042d" autoupdate.strategy = "latest_github_tag" [resources.ports] From ab7c5e6bc5d4c9d6727be2bf473432d0c06fd1fa Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 5 Oct 2023 09:54:59 +0000 Subject: [PATCH 7/8] Auto-update README --- README.md | 1 - README_fr.md | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 5030eab..e980e48 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,6 @@ A minimal Matrix chat client, focused on performance, offline functionality, and * Official app website: * Upstream app code repository: -* YunoHost documentation for this app: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index 9ef41be..dad5456 100644 --- a/README_fr.md +++ b/README_fr.md @@ -37,7 +37,6 @@ Un client de chat Matrix minimal, axé sur les performances, les fonctionnalité * Site officiel de l’app : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : * Signaler un bug : ## Informations pour les développeurs From 9b5c298984420cac311a550b2ad72e21397e9685 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 5 Oct 2023 11:56:05 +0200 Subject: [PATCH 8/8] Delete updater.sh --- .github/workflows/updater.sh | 136 ----------------------------------- 1 file changed, 136 deletions(-) delete mode 100755 .github/workflows/updater.sh diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100755 index c4d53fc..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,136 +0,0 @@ -#!/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 - *"admin"*) - src="app" - ;; - *"update"*) - src="app-upgrade" - ;; - *) - 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