From 78aecf1a54465aced9ccbb679d04c21657e9902c Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 22 Mar 2023 13:44:28 +0100 Subject: [PATCH 1/7] Fix arm support ? --- manifest.toml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/manifest.toml b/manifest.toml index b0e7870..4ac3045 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ code = "https://github.com/knadh/listmonk" [integration] yunohost = ">= 11.1.15" -architectures = ["amd64"] +architectures = ["amd64", "armhf"] multi_instance = true ldap = false sso = false @@ -46,14 +46,14 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/knadh/listmonk/releases/download/v2.4.0/listmonk_2.4.0_linux_amd64.tar.gz" - sha256 = "acdfd0f4549c15e3cd77a28778ac9904cc54abf3bec98074ee96edc64242971b" + amd64.url = "https://github.com/knadh/listmonk/releases/download/v2.4.0/listmonk_2.4.0_linux_amd64.tar.gz" + amd64.sha256 = "acdfd0f4549c15e3cd77a28778ac9904cc54abf3bec98074ee96edc64242971b" + armhf.url = "https://github.com/knadh/listmonk/archive/refs/tags/v2.4.0.tar.gz" + armhf.sha256 = "0a1fb22b485369fd47e8f19830e41c4fe5f6cf839f701fac0f6500071968faf8" + arm64.url = "https://github.com/knadh/listmonk/archive/refs/tags/v2.4.0.tar.gz" + arm64.sha256 = "0a1fb22b485369fd47e8f19830e41c4fe5f6cf839f701fac0f6500071968faf8" in_subdir = false - [resources.sources.arm] - url = "https://github.com/knadh/listmonk/archive/refs/tags/v2.4.0.tar.gz" - sha256 = "0a1fb22b485369fd47e8f19830e41c4fe5f6cf839f701fac0f6500071968faf8" - [resources.system_user] [resources.ports] From c1be441f56db07785c78d8429860375fba9ffca7 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 22 Mar 2023 13:46:23 +0100 Subject: [PATCH 2/7] Fix ARM support ? --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 4ac3045..0eceaf0 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ code = "https://github.com/knadh/listmonk" [integration] yunohost = ">= 11.1.15" -architectures = ["amd64", "armhf"] +architectures = ["amd64", "armhf", "arm64"] multi_instance = true ldap = false sso = false From 9dc0d1a349db48719e876b24766d316d4687c8b6 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 22 Mar 2023 13:48:15 +0100 Subject: [PATCH 3/7] Fix ARM support ? --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 623e247..7b8c74b 100755 --- a/scripts/install +++ b/scripts/install @@ -44,7 +44,7 @@ ynh_script_progression --message="Setting up source files..." --weight=3 # Download, check integrity, uncompress and patch the source from app.src if [ $YNH_ARCH == "armhf" ] || [ $YNH_ARCH == "arm64" ] then - ynh_setup_source --dest_dir="$install_dir/build" --source_id=arm + ynh_setup_source --dest_dir="$install_dir/build" pushd "$install_dir/build" # Build the sources ynh_use_go From 5e9462de375103f2f38595e8213565a78596ae74 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 22 Mar 2023 13:48:43 +0100 Subject: [PATCH 4/7] Fix ARM support ? --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 498e203..a1b1dcb 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -36,7 +36,7 @@ then # Download, check integrity, uncompress and patch the source from app.src if [ $YNH_ARCH == "armhf" ] || [ $YNH_ARCH == "arm64" ] then - ynh_setup_source --dest_dir="$install_dir/build" --source_id=arm --keep="$install_dir/config.toml" + ynh_setup_source --dest_dir="$install_dir/build" --keep="$install_dir/config.toml" # Install Nodejs ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version # Install Go From f8c9f4b6789c5b3f5cf60bef9b095b1f65113e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 23 Mar 2023 08:18:29 +0100 Subject: [PATCH 5/7] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 0eceaf0..385f54d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -49,9 +49,9 @@ ram.runtime = "50M" amd64.url = "https://github.com/knadh/listmonk/releases/download/v2.4.0/listmonk_2.4.0_linux_amd64.tar.gz" amd64.sha256 = "acdfd0f4549c15e3cd77a28778ac9904cc54abf3bec98074ee96edc64242971b" armhf.url = "https://github.com/knadh/listmonk/archive/refs/tags/v2.4.0.tar.gz" - armhf.sha256 = "0a1fb22b485369fd47e8f19830e41c4fe5f6cf839f701fac0f6500071968faf8" + armhf.sha256 = "60571f7e279524bee81be066bbc27929042dbe7bf4740cabeb734a0269b81939" arm64.url = "https://github.com/knadh/listmonk/archive/refs/tags/v2.4.0.tar.gz" - arm64.sha256 = "0a1fb22b485369fd47e8f19830e41c4fe5f6cf839f701fac0f6500071968faf8" + arm64.sha256 = "60571f7e279524bee81be066bbc27929042dbe7bf4740cabeb734a0269b81939" in_subdir = false [resources.system_user] From ae03a25929fa88bbfcf95efdf08b6cce7781fec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 23 Mar 2023 18:19:28 +0100 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 385f54d..6769b55 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Listmonk" description.en = "Newsletter and mailing list manager" description.fr = "Manager de newsletter et mailing list" -version = "2.4.0~ynh1" +version = "2.4.0~ynh2" maintainers = ["Navan Chauhan"] From 9b427ba6cb7d39209bf91a3c20c99ad14f938231 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 23 Mar 2023 17:19:34 +0000 Subject: [PATCH 7/7] 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 000274a..a998bf6 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Listmonk is a standalone, self-hosted, newsletter and mailing list manager. It is fast, feature-rich, and packed into a single binary. It uses a PostgreSQL (⩾ v9.4) database as its data store. -**Shipped version:** 2.4.0~ynh1 +**Shipped version:** 2.4.0~ynh2 **Demo:** https://demo.listmonk.app/ diff --git a/README_fr.md b/README_fr.md index d85c1b8..57ce9c2 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Listmonk is a standalone, self-hosted, newsletter and mailing list manager. It is fast, feature-rich, and packed into a single binary. It uses a PostgreSQL (⩾ v9.4) database as its data store. -**Version incluse :** 2.4.0~ynh1 +**Version incluse :** 2.4.0~ynh2 **Démo :** https://demo.listmonk.app/