From 85fe0150fed2a595507caaecdcef81f24c66275d Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 15 Jan 2023 10:46:10 +0100 Subject: [PATCH 01/41] yarn : switch to pnpm Necessary for v13.0.6 --- scripts/upgrade | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 33926a3..bf32aa4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -137,9 +137,9 @@ ynh_script_progression --message="Building app..." pushd "$final_path" ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run rebuild - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run migrate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run rebuild + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run migrate popd #================================================= From 57004c37614ec653c28112caf1a7da43c8f5c9bc Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 15 Jan 2023 10:46:12 +0100 Subject: [PATCH 02/41] yarn : switch to pnpm --- scripts/install | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/scripts/install b/scripts/install index 18c864e..3bbd652 100755 --- a/scripts/install +++ b/scripts/install @@ -134,13 +134,15 @@ ynh_script_progression --message="Building app..." --weight=15 pushd "$final_path" ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run clean-all - corepack enable - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn set version berry - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn plugin import workspace-tools - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run rebuild - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run migrate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run clean-all + ynh_exec_warn_less ynh_exec_as $appcorepack enable + ynh_exec_warn_less ynh_exec_as $app corepack prepare pnpm@latest --activate + ynh_exec_warn_less ynh_exec_as $app pnpm i + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm set version berry + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm plugin import workspace-tools + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run rebuild + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run migrate popd #================================================= From 0eabbf391c43030f689099e459aeacda5335fca2 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 15 Jan 2023 11:11:24 +0100 Subject: [PATCH 03/41] update to v13.0.6-rc Release candidate, but it's a way to try #10 changes. --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 034fefb..b703da9 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://codeberg.org/calckey/calckey/archive/v13.0.5.tar.gz -SOURCE_SUM=97A19C8F4E58E3DFB7085A0ACA0D48540A5B39E3FABEC3A623AAD866DE634C74 +SOURCE_URL=https://codeberg.org/calckey/calckey/archive/v13.0.6-rc.tar.gz +SOURCE_SUM=dff91164c4fca3357f545c98be7f091b114032b4a2c9d87e9d1289108cf9b69b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From deec8d72f6ec37ce01a2bf756390b0d6c0860b81 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 15 Jan 2023 11:55:41 +0100 Subject: [PATCH 04/41] typo + reordering + remove yarn --- scripts/install | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 3bbd652..85d9fa0 100755 --- a/scripts/install +++ b/scripts/install @@ -74,8 +74,6 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" - #================================================= # CREATE DEDICATED USER #================================================= @@ -134,10 +132,10 @@ ynh_script_progression --message="Building app..." --weight=15 pushd "$final_path" ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run clean-all - ynh_exec_warn_less ynh_exec_as $appcorepack enable + ynh_exec_warn_less ynh_exec_as $app corepack enable ynh_exec_warn_less ynh_exec_as $app corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app pnpm i + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run clean-all ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm set version berry ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm plugin import workspace-tools ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install From 17e5ba6bb66723639e798e5cf96c5deda1b13bea Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 15 Jan 2023 12:16:07 +0100 Subject: [PATCH 05/41] proper corepack rights --- scripts/install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 85d9fa0..c81db23 100755 --- a/scripts/install +++ b/scripts/install @@ -132,9 +132,9 @@ ynh_script_progression --message="Building app..." --weight=15 pushd "$final_path" ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app corepack enable - ynh_exec_warn_less ynh_exec_as $app corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app pnpm i + ynh_exec_warn_less corepack enable + ynh_exec_warn_less corepack prepare pnpm@latest --activate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm i ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run clean-all ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm set version berry ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm plugin import workspace-tools From 9a8a7999ef52648880a975e4a116bf7976fca476 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 15 Jan 2023 13:10:25 +0100 Subject: [PATCH 06/41] remove double + reordering --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index c81db23..ef013a9 100755 --- a/scripts/install +++ b/scripts/install @@ -134,7 +134,6 @@ pushd "$final_path" ynh_use_nodejs ynh_exec_warn_less corepack enable ynh_exec_warn_less corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm i ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run clean-all ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm set version berry ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm plugin import workspace-tools From b17a14d248305e96cf29da6e61043ef02c68d3ca Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 15 Jan 2023 14:08:55 +0100 Subject: [PATCH 07/41] =?UTF-8?q?trying=20something=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index ef013a9..0dbc6c6 100755 --- a/scripts/install +++ b/scripts/install @@ -134,7 +134,7 @@ pushd "$final_path" ynh_use_nodejs ynh_exec_warn_less corepack enable ynh_exec_warn_less corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run clean-all + ynh_exec_warn_less pnpm run clean-all ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm set version berry ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm plugin import workspace-tools ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install From 88b7ac2fd5ac9d436f4bdbdec53d21f0d4960803 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 15 Jan 2023 14:23:48 +0100 Subject: [PATCH 08/41] =?UTF-8?q?pnpm:=20What=20if=20we=20remove=20yunohos?= =?UTF-8?q?t=20helper=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/install | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/install b/scripts/install index 0dbc6c6..9b43c00 100755 --- a/scripts/install +++ b/scripts/install @@ -135,11 +135,11 @@ pushd "$final_path" ynh_exec_warn_less corepack enable ynh_exec_warn_less corepack prepare pnpm@latest --activate ynh_exec_warn_less pnpm run clean-all - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm set version berry - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm plugin import workspace-tools - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run rebuild - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run migrate + ynh_exec_warn_less pnpm set version berry + ynh_exec_warn_less pnpm plugin import workspace-tools + ynh_exec_warn_less pnpm install + ynh_exec_warn_less pnpm run rebuild + ynh_exec_warn_less pnpm run migrate popd #================================================= From 6466873bd91e9e5b79401f49345f10bd8d93a84e Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 29 Jan 2023 10:48:28 +0100 Subject: [PATCH 09/41] =?UTF-8?q?Another=20pnpm=20try=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From https://github.com/YunoHost-Apps/misskey_ynh/pull/145/files --- scripts/install | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index 9b43c00..0f2613b 100755 --- a/scripts/install +++ b/scripts/install @@ -132,14 +132,11 @@ ynh_script_progression --message="Building app..." --weight=15 pushd "$final_path" ynh_use_nodejs - ynh_exec_warn_less corepack enable - ynh_exec_warn_less corepack prepare pnpm@latest --activate - ynh_exec_warn_less pnpm run clean-all - ynh_exec_warn_less pnpm set version berry - ynh_exec_warn_less pnpm plugin import workspace-tools - ynh_exec_warn_less pnpm install - ynh_exec_warn_less pnpm run rebuild - ynh_exec_warn_less pnpm run migrate + corepack enable + 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 popd #================================================= From c4d46b1e678821de05c74470925de399651d7c44 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 29 Jan 2023 10:49:29 +0100 Subject: [PATCH 10/41] Another pnpm try --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index bf32aa4..70e03c6 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -136,10 +136,10 @@ ynh_add_nginx_config ynh_script_progression --message="Building app..." pushd "$final_path" - ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run rebuild - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run migrate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm clean-all + 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 fe55b9aafdb281b86df9614cf904c55c3dd0de85 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 29 Jan 2023 10:50:51 +0100 Subject: [PATCH 11/41] Temporary version number https://github.com/YunoHost-Apps/calckey_ynh/pull/12#issuecomment-1383218046 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 21c0482..ed169c4 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Fork of Misskey with better UI/UX, security, features", "fr": "Un fork de Misskey avec une meilleure interface utilisateur, la sécurité, les fonctionnalités" }, - "version": "13.0.5~ynh1", + "version": "13.1.0~ynh1", "url": "https://i.calckey.cloud/", "upstream": { "license": "AGPL-3.0", From df2f706a727c98be1e3668aa0e52d67734068868 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 1 Feb 2023 22:31:16 +0100 Subject: [PATCH 12/41] v13.1.0 - pnpm Inspired by this : https://codeberg.org/calckey/calckey/releases --- scripts/upgrade | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 70e03c6..ede8985 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -137,9 +137,10 @@ ynh_script_progression --message="Building app..." pushd "$final_path" ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm clean-all + 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 + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run migrate popd #================================================= From 45a2d93ea5e935358576ce2f0e6d721fb41e1661 Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 1 Feb 2023 22:49:42 +0100 Subject: [PATCH 13/41] v13.1.0 --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index b703da9..19db8ca 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://codeberg.org/calckey/calckey/archive/v13.0.6-rc.tar.gz -SOURCE_SUM=dff91164c4fca3357f545c98be7f091b114032b4a2c9d87e9d1289108cf9b69b +SOURCE_URL=https://codeberg.org/calckey/calckey/archive/v13.1.0.tar.gz +SOURCE_SUM=39e68dc646d55f72fef068c6f5e0e640a5d31a9128d4b6bff1145f251a409c2d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From e6076bcb5ff51c1bd3d2858355b746da47096deb Mon Sep 17 00:00:00 2001 From: lapineige Date: Wed, 1 Feb 2023 23:57:32 +0100 Subject: [PATCH 14/41] remove --frozen-lockfile --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 0f2613b..5a60859 100755 --- a/scripts/install +++ b/scripts/install @@ -134,7 +134,7 @@ pushd "$final_path" ynh_use_nodejs corepack enable 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 pnpm install 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 568bd3215b4fed428966aef8a3f21cbefe02b36d Mon Sep 17 00:00:00 2001 From: lapineige Date: Thu, 2 Feb 2023 01:13:16 +0100 Subject: [PATCH 15/41] pnpm --- scripts/restore | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scripts/restore b/scripts/restore index 50a0ea5..a6cf46f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -75,6 +75,13 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" +# enable pnpm again +pushd "$final_path" + ynh_use_nodejs + corepack enable + corepack prepare pnpm@latest --activate +popd + #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= From 22e4a4572934cc7d1166e89e62b302793f8d3d0e Mon Sep 17 00:00:00 2001 From: lapineige Date: Thu, 2 Feb 2023 09:56:02 +0100 Subject: [PATCH 16/41] pnpm migration + yarn dependency not needed ? Yarn not installed on install, why on upgrade ? And https://codeberg.org/calckey/calckey/releases/tag/v13.1.0 --- scripts/restore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index a6cf46f..2633b61 100755 --- a/scripts/restore +++ b/scripts/restore @@ -73,13 +73,15 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=5 # Define and install dependencies ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" # enable pnpm again pushd "$final_path" ynh_use_nodejs corepack enable corepack prepare pnpm@latest --activate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install + 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 migrate popd #================================================= From fc46e8701e5d598d2cfd7e289be548b8f4a822dc Mon Sep 17 00:00:00 2001 From: lapineige Date: Thu, 2 Feb 2023 16:24:23 +0100 Subject: [PATCH 17/41] Update restore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Trying to remove `ERR_PNPM_RECURSIVE_RUN_FIRST_FAIL  backend@ migrate: `typeorm migration:run -d ormconfig.js` restoration error. --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 2633b61..075f5db 100755 --- a/scripts/restore +++ b/scripts/restore @@ -81,7 +81,7 @@ pushd "$final_path" corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install 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 migrate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run migrate popd #================================================= From 2e204cc43611d9b0377eaa237cc116f78cd9773f Mon Sep 17 00:00:00 2001 From: lapineige Date: Thu, 2 Feb 2023 16:24:41 +0100 Subject: [PATCH 18/41] reordering + remove frozen-lockfile --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index ede8985..533b384 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -136,9 +136,9 @@ ynh_add_nginx_config ynh_script_progression --message="Building app..." pushd "$final_path" - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm clean-all 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 pnpm clean-all + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run migrate popd From 5e658c7fafd4e6721bea6c6bf42a32f3c83e27b2 Mon Sep 17 00:00:00 2001 From: lapineige Date: Thu, 2 Feb 2023 21:16:40 +0100 Subject: [PATCH 19/41] new sha256sum --- conf/app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index 19db8ca..9b93a74 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ SOURCE_URL=https://codeberg.org/calckey/calckey/archive/v13.1.0.tar.gz -SOURCE_SUM=39e68dc646d55f72fef068c6f5e0e640a5d31a9128d4b6bff1145f251a409c2d +SOURCE_SUM=a7e6f45209ab1e38bb1831427551fa8f04b00121614db7d550f62f99255adc33 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From 0a094cf6979d09336dc4925f882292d46ef60520 Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 3 Feb 2023 13:50:01 +0100 Subject: [PATCH 20/41] Improve progression status --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 5a60859..0aeeba2 100755 --- a/scripts/install +++ b/scripts/install @@ -68,7 +68,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=3 +ynh_script_progression --message="Installing dependencies... This might take some time." --weight=3 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION @@ -128,7 +128,7 @@ ynh_add_config --template="../conf/default.yml" --destination="$final_path/.conf #================================================= # BUILD APP #================================================= -ynh_script_progression --message="Building app..." --weight=15 +ynh_script_progression --message="Building app... This will take some time." --weight=15 pushd "$final_path" ynh_use_nodejs From 5608da608e481b29da088e9737057dfdfa855f6b Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 3 Feb 2023 17:06:51 +0100 Subject: [PATCH 21/41] Revert files --- conf/app.src | 4 ++-- scripts/install | 12 ++++++++---- scripts/restore | 1 + scripts/upgrade | 9 ++++----- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/conf/app.src b/conf/app.src index d332438..034fefb 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://codeberg.org/calckey/calckey/archive/13.1.tar.gz -SOURCE_SUM=A7E6F45209AB1E38BB1831427551FA8F04B00121614DB7D550F62F99255ADC33 +SOURCE_URL=https://codeberg.org/calckey/calckey/archive/v13.0.5.tar.gz +SOURCE_SUM=97A19C8F4E58E3DFB7085A0ACA0D48540A5B39E3FABEC3A623AAD866DE634C74 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/scripts/install b/scripts/install index 4a6b639..18c864e 100755 --- a/scripts/install +++ b/scripts/install @@ -74,6 +74,8 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" + #================================================= # CREATE DEDICATED USER #================================================= @@ -132,11 +134,13 @@ ynh_script_progression --message="Building app..." --weight=15 pushd "$final_path" ynh_use_nodejs + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run clean-all corepack enable - corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm i - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run init + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn set version berry + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn plugin import workspace-tools + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run rebuild + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run migrate popd #================================================= diff --git a/scripts/restore b/scripts/restore index 5969136..50a0ea5 100755 --- a/scripts/restore +++ b/scripts/restore @@ -73,6 +73,7 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=5 # Define and install dependencies ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" #================================================= # RESTORE THE NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index 63625a5..33926a3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -120,6 +120,7 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=5 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" #================================================= # NGINX CONFIGURATION @@ -136,11 +137,9 @@ ynh_script_progression --message="Building app..." pushd "$final_path" ynh_use_nodejs - corepack enable - corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm install - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm migrate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run rebuild + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run migrate popd #================================================= From 4c9a93727412f92cc7e6d61ae04c5e2ecbc12241 Mon Sep 17 00:00:00 2001 From: lapineige Date: Fri, 3 Feb 2023 19:35:17 +0100 Subject: [PATCH 22/41] Switch to pnpm --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 2b708ad..28759d4 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,7 +9,7 @@ Group=__APP__ WorkingDirectory=__FINALPATH__/ Environment="__YNH_NODE_LOAD_PATH__" Environment="NODE_ENV=production" -ExecStart=__YNH_NPM__ start +ExecStart=pnpm start TimeoutSec=60 Restart=always From 05eca3cf78257c818cf56d8a1b17f4cb615d4544 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sat, 4 Feb 2023 07:35:42 +0100 Subject: [PATCH 23/41] Update v13.1.1 --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index d332438..16e61ef 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://codeberg.org/calckey/calckey/archive/13.1.tar.gz -SOURCE_SUM=A7E6F45209AB1E38BB1831427551FA8F04B00121614DB7D550F62F99255ADC33 +SOURCE_URL=https://codeberg.org/calckey/calckey/archive/v13.1.1.tar.gz +SOURCE_SUM=934d839d7c5af858f064481da2060ef1875839a6a13e0fa8043651f48b5bc175 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From c5f089e536a4e0c2a4f8d74d9fd56bcdbe3447d8 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sat, 4 Feb 2023 07:43:20 +0100 Subject: [PATCH 24/41] Fix --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 63625a5..189f843 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -137,10 +137,10 @@ ynh_script_progression --message="Building app..." pushd "$final_path" ynh_use_nodejs corepack enable - corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm install - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm migrate + corepack prepare pnpm@latest --activate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm install + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm migrate popd #================================================= From a0cf287061b28f00cb219417b407222706229e6a Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sat, 4 Feb 2023 07:58:21 +0100 Subject: [PATCH 25/41] Fix --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 189f843..9f9a2e2 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -138,7 +138,7 @@ pushd "$final_path" ynh_use_nodejs corepack enable corepack prepare pnpm@latest --activate - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm install + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm i ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm migrate popd From adf0445dfa0f9e0aee0fafef45a96ffb28180878 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 4 Feb 2023 08:47:48 +0100 Subject: [PATCH 26/41] v13.1.1 Hotfix: https://codeberg.org/calckey/calckey/releases/tag/v13.1.1 --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 9b93a74..9b55c3a 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://codeberg.org/calckey/calckey/archive/v13.1.0.tar.gz -SOURCE_SUM=a7e6f45209ab1e38bb1831427551fa8f04b00121614db7d550f62f99255adc33 +SOURCE_URL=https://codeberg.org/calckey/calckey/archive/v13.1.1.tar.gz +SOURCE_SUM=934d839d7c5af858f064481da2060ef1875839a6a13e0fa8043651f48b5bc175 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From ea41710251105afb4f2fac9b925b6a76afcd0fc0 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 4 Feb 2023 09:03:23 +0100 Subject: [PATCH 27/41] It needs the full pnpm path --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 28759d4..6249b5a 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,7 +9,7 @@ Group=__APP__ WorkingDirectory=__FINALPATH__/ Environment="__YNH_NODE_LOAD_PATH__" Environment="NODE_ENV=production" -ExecStart=pnpm start +ExecStart="/opt/node_n/n/versions/node/19.4.0/bin/pnpm start" TimeoutSec=60 Restart=always From 7a565f24b2a1796b5874f885139838ed6f2c157f Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 4 Feb 2023 09:08:27 +0100 Subject: [PATCH 28/41] v13.1.1 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index ed169c4..4750ace 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Fork of Misskey with better UI/UX, security, features", "fr": "Un fork de Misskey avec une meilleure interface utilisateur, la sécurité, les fonctionnalités" }, - "version": "13.1.0~ynh1", + "version": "13.1.1~ynh1", "url": "https://i.calckey.cloud/", "upstream": { "license": "AGPL-3.0", From 2cfd40ab99de845cfb3cc599ce7734a737acb380 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 4 Feb 2023 16:34:38 +0100 Subject: [PATCH 29/41] Change pnpm path --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 6249b5a..00de844 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,7 +9,7 @@ Group=__APP__ WorkingDirectory=__FINALPATH__/ Environment="__YNH_NODE_LOAD_PATH__" Environment="NODE_ENV=production" -ExecStart="/opt/node_n/n/versions/node/19.4.0/bin/pnpm start" +ExecStart="/opt/node_n/n/versions/node/19/bin/pnpm start" TimeoutSec=60 Restart=always From 1cd508f0a55e6af88fe4bd4a5db866f3a7890a6a Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sat, 4 Feb 2023 20:22:02 +0100 Subject: [PATCH 30/41] Update systemd.service --- conf/systemd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/systemd.service b/conf/systemd.service index 00de844..2b708ad 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -9,7 +9,7 @@ Group=__APP__ WorkingDirectory=__FINALPATH__/ Environment="__YNH_NODE_LOAD_PATH__" Environment="NODE_ENV=production" -ExecStart="/opt/node_n/n/versions/node/19/bin/pnpm start" +ExecStart=__YNH_NPM__ start TimeoutSec=60 Restart=always From 0f299c144ae1b5e5d82ed4d5f009ddc88be5bd48 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sat, 4 Feb 2023 20:24:44 +0100 Subject: [PATCH 31/41] Update upgrade --- scripts/upgrade | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upgrade b/scripts/upgrade index d297831..e72431e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -135,6 +135,7 @@ ynh_add_nginx_config ynh_script_progression --message="Building app..." pushd "$final_path" + corepack enable corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm clean-all ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install From 2318cce61db17ad9a591853cea4b871e21dfe5ff Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sat, 4 Feb 2023 21:20:44 +0100 Subject: [PATCH 32/41] Update restore --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 82eb7db..c13a51a 100644 --- a/scripts/restore +++ b/scripts/restore @@ -86,7 +86,7 @@ pushd "$final_path" corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install 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 NODE_ENV=production pnpm run migrate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm init popd #================================================= From 93645f26959d4e567607a1381d63be8901ba2c4c Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sat, 4 Feb 2023 21:41:17 +0100 Subject: [PATCH 33/41] Update upgrade --- scripts/upgrade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 9f9a2e2..aadeb9e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -138,9 +138,10 @@ pushd "$final_path" ynh_use_nodejs corepack enable corepack prepare pnpm@latest --activate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm clean-all ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm i ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm run build - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm migrate + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm migrate popd #================================================= From 5f4d6581887d77e5dececb6ed9e0b22e7d849edf Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sat, 4 Feb 2023 22:03:43 +0100 Subject: [PATCH 34/41] Update restore --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index c13a51a..ea467a0 100644 --- a/scripts/restore +++ b/scripts/restore @@ -85,8 +85,6 @@ pushd "$final_path" corepack enable corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install - 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 init popd #================================================= From 317fd9bbaec9002e682ca4935e91c3fe1429d252 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sun, 5 Feb 2023 00:46:57 +0100 Subject: [PATCH 35/41] build command is back According to https://github.com/YunoHost-Apps/calckey_ynh/pull/12#issuecomment-1416866696 --- scripts/restore | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/restore b/scripts/restore index ea467a0..2e6e9c9 100644 --- a/scripts/restore +++ b/scripts/restore @@ -85,6 +85,7 @@ pushd "$final_path" corepack enable corepack prepare pnpm@latest --activate ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm install + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production pnpm build popd #================================================= From f84670a1793aeec755862178ea246cba7149b0df Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 5 Feb 2023 10:13:23 +0000 Subject: [PATCH 36/41] 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 a8124d2..cc45256 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ A greatly enhanced fork of Misskey with better UI/UX, security, features, and mo -**Shipped version:** 13.0.5~ynh1 +**Shipped version:** 13.1.1~ynh1 **Demo:** https://i.calckey.cloud/ diff --git a/README_fr.md b/README_fr.md index a205a30..2e3f9c9 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Un fork grandement amélioré de Misskey avec une meilleure UI/UX, sécurité, f Calckey ajoute de nombreux changements de qualité de vie et des corrections de bogues pour les utilisateurs et les administrateurs d'instance. -**Version incluse :** 13.0.5~ynh1 +**Version incluse :** 13.1.1~ynh1 **Démo :** https://i.calckey.cloud/ From 67ec1699cbeb9cdcf397ba21ebef525c6d757927 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Mon, 6 Feb 2023 09:10:43 +0100 Subject: [PATCH 37/41] Update v13.1.2 --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 9b55c3a..3c40761 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://codeberg.org/calckey/calckey/archive/v13.1.1.tar.gz -SOURCE_SUM=934d839d7c5af858f064481da2060ef1875839a6a13e0fa8043651f48b5bc175 +SOURCE_URL=https://codeberg.org/calckey/calckey/archive/v13.1.2.tar.gz +SOURCE_SUM=1CA6ACE1BAC1F9BFBA70FC55F828F8C6F3BCC042003A6FE8D9FB16DF0AD678EB SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From 7e91ce078f94b50aa0a5107bd5a3f5d86ee707fa Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Mon, 6 Feb 2023 09:16:45 +0100 Subject: [PATCH 38/41] Update v13.1.2 --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 4750ace..bbfeb05 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Fork of Misskey with better UI/UX, security, features", "fr": "Un fork de Misskey avec une meilleure interface utilisateur, la sécurité, les fonctionnalités" }, - "version": "13.1.1~ynh1", + "version": "13.1.2~ynh1", "url": "https://i.calckey.cloud/", "upstream": { "license": "AGPL-3.0", From aa0e152595d7ff1f508b2a40deb3a85f11be96fc Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 6 Feb 2023 08:16:48 +0000 Subject: [PATCH 39/41] 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 cc45256..6916fcf 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ A greatly enhanced fork of Misskey with better UI/UX, security, features, and mo -**Shipped version:** 13.1.1~ynh1 +**Shipped version:** 13.1.2~ynh1 **Demo:** https://i.calckey.cloud/ diff --git a/README_fr.md b/README_fr.md index 2e3f9c9..e491ddc 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ Un fork grandement amélioré de Misskey avec une meilleure UI/UX, sécurité, f Calckey ajoute de nombreux changements de qualité de vie et des corrections de bogues pour les utilisateurs et les administrateurs d'instance. -**Version incluse :** 13.1.1~ynh1 +**Version incluse :** 13.1.2~ynh1 **Démo :** https://i.calckey.cloud/ From f42ae7050d6da83c547c1231cf233d0414c14372 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Mon, 6 Feb 2023 09:24:58 +0100 Subject: [PATCH 40/41] Fix updater.sh --- .github/workflows/updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 5d163d6..194313e 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -10,7 +10,7 @@ # automatic actions when a new upstream release is detected. # Remove this exit command when you are ready to run this Action - exit 1 +#exit 1 #================================================= # FETCHING LATEST RELEASE AND ITS ASSETS From d8cde60a711ff4019945e236149c1a15266e047d Mon Sep 17 00:00:00 2001 From: lapineige Date: Mon, 6 Feb 2023 17:21:31 +0100 Subject: [PATCH 41/41] remove yarn on upgrade + typo --- scripts/upgrade | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index e72431e..ed1c22f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -44,7 +44,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." --weight=1 -# Stop bservice before backup, to not loose message in case of failed upgrade and restore +# Stop service before backup, to not loose message in case of failed upgrade and restore ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped" #================================================= @@ -121,6 +121,10 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=5 ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies +# REMOVE YARN (upgrade from 13.0.x to 13.1.x) +ynh_script_progression --message="Removing old version dependency..." +ynh_secure_remove --file="$final_path/.yarn" + #================================================= # NGINX CONFIGURATION #=================================================