From f27d0b7c26c398660efc986b91a6299703f5ae7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 May 2024 19:17:22 +0200 Subject: [PATCH 1/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 7df66f1..90ed128 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Conduit" description.en = "Simple, fast and reliable chat server powered by Matrix" description.fr = "Serveur de chat simple, rapide et fiable alimenté par Matrix" -version = "0.6.0~ynh6" +version = "0.7.0~ynh1" maintainers = [] From 55419f7c8c54f1430c3b07161cccb69c148a90f8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 2 May 2024 17:17:27 +0000 Subject: [PATCH 2/7] Auto-update READMEs --- README.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 29cfd26..89c2041 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ It shall NOT be edited by hand. Conduit is a lightweight open-source server implementation of the Matrix Specification with a focus on easy setup and low system requirements. That means you can make your own Conduit setup in just a few minutes. Conduit keeps things simple, it's a single binary with an embedded database and can be much faster than other server implementations in some cases. -**Shipped version:** 0.6.0~ynh6 +**Shipped version:** 0.7.0~ynh1 ## Documentation and resources - Official app website: diff --git a/README_eu.md b/README_eu.md index 53d03a9..a683875 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. Conduit is a lightweight open-source server implementation of the Matrix Specification with a focus on easy setup and low system requirements. That means you can make your own Conduit setup in just a few minutes. Conduit keeps things simple, it's a single binary with an embedded database and can be much faster than other server implementations in some cases. -**Paketatutako bertsioa:** 0.6.0~ynh6 +**Paketatutako bertsioa:** 0.7.0~ynh1 ## Dokumentazioa eta baliabideak - Aplikazioaren webgune ofiziala: diff --git a/README_fr.md b/README_fr.md index 01b371c..9c68afe 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Conduit est une implémentation de serveur open source légère de la spécification Matrix avec un accent sur une configuration facile et des exigences système faibles. Cela signifie que vous pouvez créer votre propre configuration Conduit en quelques minutes seulement. Conduit garde les choses simples, c'est un binaire unique avec une base de données intégrée et peut être beaucoup plus rapide que d'autres implémentations de serveur dans certains cas. -**Version incluse :** 0.6.0~ynh6 +**Version incluse :** 0.7.0~ynh1 ## Documentations et ressources - Site officiel de l’app : diff --git a/README_gl.md b/README_gl.md index f5980b7..d916e86 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. Conduit is a lightweight open-source server implementation of the Matrix Specification with a focus on easy setup and low system requirements. That means you can make your own Conduit setup in just a few minutes. Conduit keeps things simple, it's a single binary with an embedded database and can be much faster than other server implementations in some cases. -**Versión proporcionada:** 0.6.0~ynh6 +**Versión proporcionada:** 0.7.0~ynh1 ## Documentación e recursos - Web oficial da app: diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 6342e20..727dd40 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ Conduit is a lightweight open-source server implementation of the Matrix Specification with a focus on easy setup and low system requirements. That means you can make your own Conduit setup in just a few minutes. Conduit keeps things simple, it's a single binary with an embedded database and can be much faster than other server implementations in some cases. -**分发版本：** 0.6.0~ynh6 +**分发版本：** 0.7.0~ynh1 ## 文档与资源 - 官方应用网站： From 70b029571ac263d077c2f6b5109c9e5f73273793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 May 2024 19:34:27 +0200 Subject: [PATCH 3/7] Update manifest.toml --- manifest.toml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/manifest.toml b/manifest.toml index 90ed128..8f6c6e2 100644 --- a/manifest.toml +++ b/manifest.toml @@ -62,12 +62,8 @@ ram.runtime = "50M" in_subdir = false extract = false rename = "conduit" - amd64.url = "https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_amd64/conduit?job=docker:master" - amd64.sha256 = "eb085e2a43e9225da1fafe01956b361a48b48a1dce9370c3e09bbc120ff6998d" - arm64.url = "https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_arm64/conduit?job=docker:master" - arm64.sha256 = "ef089841b2ff23285fa458459a3add2a608c0ec0702434b1a8973d2cac1b978f" - armhf.url = "https://gitlab.com/famedly/conduit/-/jobs/artifacts/master/raw/build-output/linux_arm_v7/conduit?job=docker:master" - armhf.sha256 = "595534a8eb19496f7ac39130e62a29645fc04b001faad72032144ab97467d394" + amd64.url = "https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/master/raw/x86_64-unknown-linux-musl?job=artifacts" + amd64.sha256 = "eafa400feefee2a2117d56a09c891d0c39cbec30520a2422056d7d2dcd00de04" [resources.system_user] From 2b30c451c65caff750773f327cea94d214b45d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 May 2024 19:46:31 +0200 Subject: [PATCH 4/7] Update manifest.toml --- manifest.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifest.toml b/manifest.toml index 8f6c6e2..56b4f31 100644 --- a/manifest.toml +++ b/manifest.toml @@ -64,6 +64,8 @@ ram.runtime = "50M" rename = "conduit" amd64.url = "https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/master/raw/x86_64-unknown-linux-musl?job=artifacts" amd64.sha256 = "eafa400feefee2a2117d56a09c891d0c39cbec30520a2422056d7d2dcd00de04" + arm64.url = "https://gitlab.com/api/v4/projects/famedly%2Fconduit/jobs/artifacts/master/raw/aarch64-unknown-linux-musl?job=artifacts" + arm64.sha256 = "371a6572c370f82810e41666fe71bdacfd7b611b245310d6465392e9da7c3130" [resources.system_user] From b579617aefbb2bea985578739e6f70ea600bc906 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 2 May 2024 17:51:51 +0000 Subject: [PATCH 5/7] Auto-update READMEs --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 9f689e9..112b78f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,8 +19,8 @@ Il NE doit PAS être modifié à la main. Conduit est une implémentation de serveur open source légère de la spécification Matrix avec un accent sur une configuration facile et des exigences système faibles. Cela signifie que vous pouvez créer votre propre configuration Conduit en quelques minutes seulement. Conduit garde les choses simples, c'est un binaire unique avec une base de données intégrée et peut être beaucoup plus rapide que d'autres implémentations de serveur dans certains cas. -**Version incluse :** 0.7.0~ynh1 +**Version incluse :** 0.7.0~ynh1 ## Documentations et ressources - Site officiel de l’app : From 302f0abf214a7e5cdd80960247ef1720bff4058f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 May 2024 20:04:15 +0200 Subject: [PATCH 6/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 56b4f31..eae82a0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ fund = "https://liberapay.com/timokoesters/" [integration] yunohost = ">= 11.2" -architectures = [ "arm64", "amd64", "armhf" ] +architectures = [ "arm64", "amd64" ] multi_instance = false ldap = "not_relevant" From c1824c1a10a9c41d04211640e93625944ccc747d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 2 May 2024 20:04:59 +0200 Subject: [PATCH 7/7] Update upgrade --- scripts/upgrade | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 93a5b47..b5b16b0 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,8 +9,6 @@ source _common.sh source /usr/share/yunohost/helpers -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # STOP SYSTEMD SERVICE #================================================= @@ -23,13 +21,9 @@ ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - ynh_script_progression --message="Upgrading source files..." --weight=1 - - ynh_setup_source --dest_dir="$install_dir" --keep="conduit.toml" -fi +ynh_setup_source --dest_dir="$install_dir" --keep="conduit.toml" chown -R $app:root "$install_dir" chmod +x "$install_dir/conduit"