From e85d52ab3aa59bda13a9c03352a2734d02ae517d Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Sat, 27 Apr 2024 21:49:06 +0200 Subject: [PATCH 1/9] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 9ded27e..dee7d5d 100755 --- a/scripts/install +++ b/scripts/install @@ -55,8 +55,8 @@ ynh_script_progression --message="Building app..." --weight=15 pushd "$install_dir" ynh_use_nodejs - corepack enable - corepack prepare pnpm@latest --activate + env $ynh_node_load corepack enable + env $ynh_node_load COREPACK_ENABLE_DOWNLOAD_PROMPT=0 prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --frozen-lockfile ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run init From c3bd330814f75a2b355efc9ce507f6dec73a6c22 Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Sat, 27 Apr 2024 22:39:28 +0200 Subject: [PATCH 2/9] Update install --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index dee7d5d..37d8538 100755 --- a/scripts/install +++ b/scripts/install @@ -55,8 +55,8 @@ ynh_script_progression --message="Building app..." --weight=15 pushd "$install_dir" ynh_use_nodejs - env $ynh_node_load corepack enable - env $ynh_node_load COREPACK_ENABLE_DOWNLOAD_PROMPT=0 prepare pnpm@latest --activate + env $ynh_node_load_PATH corepack enable + env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --frozen-lockfile ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run init From 7aab6fc2cc56bb2e3a65969cb6e16d6c226914e6 Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Sat, 27 Apr 2024 23:13:53 +0200 Subject: [PATCH 3/9] Update install --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 37d8538..c19d404 100755 --- a/scripts/install +++ b/scripts/install @@ -56,7 +56,7 @@ ynh_script_progression --message="Building app..." --weight=15 pushd "$install_dir" ynh_use_nodejs env $ynh_node_load_PATH corepack enable - env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 prepare pnpm@latest --activate + env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --frozen-lockfile ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run init From d4966199b6feb9d381ba85642d4969dfc068831c Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Sat, 27 Apr 2024 23:15:41 +0200 Subject: [PATCH 4/9] Update upgrade --- scripts/upgrade | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4444cad..606e72c 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -64,10 +64,12 @@ ynh_script_progression --message="Building app..." pushd "$install_dir" ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm cleanall - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --frozen-lockfile - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm migrate + env $ynh_node_load_PATH corepack enable + env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare --activate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm cleanall + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --frozen-lockfile + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm migrate popd #================================================= From 45bce9c6904914c1cd631563572abdef42cc9a25 Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Sun, 12 May 2024 15:32:59 +0200 Subject: [PATCH 5/9] Fix restore and upgrade --- scripts/restore | 4 ++-- scripts/upgrade | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/restore b/scripts/restore index 5443a51..dec00f8 100755 --- a/scripts/restore +++ b/scripts/restore @@ -38,8 +38,8 @@ ynh_script_progression --message="Reinstalling PNPM..." --weight=1 # Define and install pnpm pushd "$install_dir" ynh_use_nodejs - corepack enable - corepack prepare pnpm@latest --activate + env $ynh_node_load_PATH corepack enable + env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --frozen-lockfile ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build popd diff --git a/scripts/upgrade b/scripts/upgrade index 606e72c..851d4fa 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -64,9 +64,8 @@ ynh_script_progression --message="Building app..." pushd "$install_dir" ynh_use_nodejs - env $ynh_node_load_PATH corepack enable - env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 pnpm cleanall + env $ynh_node_load_PATH corepack enable + env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --frozen-lockfile ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm migrate From b52dc1d98e5f2854f31856c864a67e23c3f114a1 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Thu, 23 May 2024 11:42:18 +0200 Subject: [PATCH 6/9] Remove redis helpers --- scripts/_common.sh | 44 +------------------------------------------- scripts/install | 2 +- 2 files changed, 2 insertions(+), 44 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index fbc676c..5fc2b60 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,46 +12,4 @@ NODEJS_VERSION="20" #================================================= # EXPERIMENTAL HELPERS -#================================================= - -#================================================= -# REDIS HELPERS -#================================================= - -# get the first available redis database -# -# usage: ynh_redis_get_free_db -# | returns: the database number to use -ynh_redis_get_free_db() { - local result max db - result="$(redis-cli INFO keyspace)" - - # get the num - max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+") - - db=0 - # default Debian setting is 15 databases - for i in $(seq 0 "$max") - do - if ! echo "$result" | grep -q "db$i" - then - db=$i - break 1 - fi - db=-1 - done - - test "$db" -eq -1 && ynh_die --message="No available Redis databases..." - - echo "$db" -} - -# Create a master password and set up global settings -# Please always call this script in install and restore scripts -# -# usage: ynh_redis_remove_db database -# | arg: database - the database to erase -ynh_redis_remove_db() { - local db=$1 - redis-cli -n "$db" flushall -} +#================================================= \ No newline at end of file diff --git a/scripts/install b/scripts/install index c19d404..59f766b 100755 --- a/scripts/install +++ b/scripts/install @@ -57,7 +57,7 @@ pushd "$install_dir" ynh_use_nodejs env $ynh_node_load_PATH corepack enable env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install --frozen-lockfile + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack pnpm install --frozen-lockfile ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run init popd From 3cfadb2555ce9ad4a5d042dadd22bf69316f77e5 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Thu, 23 May 2024 13:37:01 +0200 Subject: [PATCH 7/9] Removing test_upgrade_from --- tests.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests.toml b/tests.toml index cf0c328..cb3409b 100644 --- a/tests.toml +++ b/tests.toml @@ -10,6 +10,4 @@ test_format = 1.0 # ------------------------------- # Commits to test upgrade from - # ------------------------------- - - test_upgrade_from.ce8f3365661567ea5f23168b785a5d290a0bcf38.name = "2023.12.1" \ No newline at end of file + # ------------------------------- \ No newline at end of file From df10ce36809ed232a252c4e4e648645f9fe46c02 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Thu, 23 May 2024 16:12:10 +0200 Subject: [PATCH 8/9] Update 2024.3.3 --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 58fe17f..1dab43a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -37,8 +37,8 @@ ram.runtime = "50M" [resources] [resources.sources.main] - url = "https://activitypub.software/TransFem-org/Sharkey/-/archive/2024.3.1/Sharkey-2024.3.1.tar.gz" - sha256 = "b07371c6c7404e907b1d3102b051fa768f6d0d1ecc41d2894899bdfbe78369af" + url = "https://activitypub.software/TransFem-org/Sharkey/-/archive/2024.3.3/Sharkey-2024.3.3.tar.gz" + sha256 = "7bbe05f762d9dcc55562766c7dcde3c7cb8d3942aac5119ace8d7812da217d3f" autoupdate.strategy = "latest_gitlab_tag" From c74f1c70d1c703c5414dfb5bc17fb24fac8c790d Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 23 May 2024 15:30:29 +0000 Subject: [PATCH 9/9] Auto-update READMEs --- ALL_README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ALL_README.md b/ALL_README.md index 8938aae..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,7 +1,7 @@ # All available README files by language - [Read the README in English](README.md) -- [Lee el README en español](README_es.md) +- [Lea el README en español](README_es.md) - [Irakurri README euskaraz](README_eu.md) - [Lire le README en français](README_fr.md) - [Le o README en galego](README_gl.md)