From cc4c1456a87e89661540d2442ea2e7e7e3fc2ae7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 10 Jun 2024 03:50:28 +0200 Subject: [PATCH 01/14] Upgrade to v2024.06.08 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 4027c18..69d58bf 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Terraforming Mars " description.en = "Open-source online implementation of the great board game Terraforming mars." description.fr = "Implementation en ligne à code source ouvert de l’excellent jeu de plateau Terraforming Mars" -version = "2024.06.07~ynh1" +version = "2024.06.08~ynh1" maintainers = ["Thovi98"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/terraforming-mars/terraforming-mars/archive/cb0934184263d5bf013a62d2cb1bd49975df662e.tar.gz" - sha256 = "0cf4167abcd9ce8ce1ec942cbd4f94d4e072d59ae96537dbb3e0bc59113166fc" + url = "https://github.com/terraforming-mars/terraforming-mars/archive/d93773808b154917985cf07f887d86c01a97cfee.tar.gz" + sha256 = "c3801c21a2019172bf8c3ce916ad28fa0911bddd937352be2bc75fc3abc02686" in_subdir = true autoupdate.strategy = "latest_github_commit" From 165386a2580940a5172ab67e7f9c62bc8ec161d0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 10 Jun 2024 01:50:30 +0000 Subject: [PATCH 02/14] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 81822c2..6563f04 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ It shall NOT be edited by hand. This is an open-source online implementation of the great board game Terraforming mars. It is not affiliated with FryxGames, Asmodee Digital or Steam in any way. -**Shipped version:** 2024.06.07~ynh1 +**Shipped version:** 2024.06.08~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 9ba5ae4..cf90c63 100644 --- a/README_es.md +++ b/README_es.md @@ -19,7 +19,7 @@ No se debe editar a mano. This is an open-source online implementation of the great board game Terraforming mars. It is not affiliated with FryxGames, Asmodee Digital or Steam in any way. -**Versión actual:** 2024.06.07~ynh1 +**Versión actual:** 2024.06.08~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 00af058..b515982 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. This is an open-source online implementation of the great board game Terraforming mars. It is not affiliated with FryxGames, Asmodee Digital or Steam in any way. -**Paketatutako bertsioa:** 2024.06.07~ynh1 +**Paketatutako bertsioa:** 2024.06.08~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 9a7f96c..09e3bc3 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Cette application est une implémentation en ligne et open source de l’excellent jeu de plateau Terraforming mars. Elle n’est affiliée à FryxGames, Asmodee Digital ou Steam en aucun cas. -**Version incluse :** 2024.06.07~ynh1 +**Version incluse :** 2024.06.08~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 38f457a..bf65d40 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. This is an open-source online implementation of the great board game Terraforming mars. It is not affiliated with FryxGames, Asmodee Digital or Steam in any way. -**Versión proporcionada:** 2024.06.07~ynh1 +**Versión proporcionada:** 2024.06.08~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index a1ec893..1cd63b8 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ This is an open-source online implementation of the great board game Terraforming mars. It is not affiliated with FryxGames, Asmodee Digital or Steam in any way. -**分发版本：** 2024.06.07~ynh1 +**分发版本：** 2024.06.08~ynh1 **演示：** From f31087e4df165086821f1d8be271421f7e49fbc7 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 12 Jun 2024 03:48:55 +0200 Subject: [PATCH 03/14] Upgrade to v2024.06.11 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 69d58bf..ec96d94 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ name = "Terraforming Mars " description.en = "Open-source online implementation of the great board game Terraforming mars." description.fr = "Implementation en ligne à code source ouvert de l’excellent jeu de plateau Terraforming Mars" -version = "2024.06.08~ynh1" +version = "2024.06.11~ynh1" maintainers = ["Thovi98"] @@ -45,8 +45,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/terraforming-mars/terraforming-mars/archive/d93773808b154917985cf07f887d86c01a97cfee.tar.gz" - sha256 = "c3801c21a2019172bf8c3ce916ad28fa0911bddd937352be2bc75fc3abc02686" + url = "https://github.com/terraforming-mars/terraforming-mars/archive/24d7b33bff0cbd69a34f34cd172ed75332f3e1a3.tar.gz" + sha256 = "e20538b083a515184faab20bd5d033c6c2dcc31401a22ec85c21111fabbbd249" in_subdir = true autoupdate.strategy = "latest_github_commit" From 23d84e64f5e491cff3f76af36ed53d12357bd82e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 12 Jun 2024 01:48:57 +0000 Subject: [PATCH 04/14] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6563f04..9bcb725 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ It shall NOT be edited by hand. This is an open-source online implementation of the great board game Terraforming mars. It is not affiliated with FryxGames, Asmodee Digital or Steam in any way. -**Shipped version:** 2024.06.08~ynh1 +**Shipped version:** 2024.06.11~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index cf90c63..49bdb54 100644 --- a/README_es.md +++ b/README_es.md @@ -19,7 +19,7 @@ No se debe editar a mano. This is an open-source online implementation of the great board game Terraforming mars. It is not affiliated with FryxGames, Asmodee Digital or Steam in any way. -**Versión actual:** 2024.06.08~ynh1 +**Versión actual:** 2024.06.11~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index b515982..6ea9678 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. This is an open-source online implementation of the great board game Terraforming mars. It is not affiliated with FryxGames, Asmodee Digital or Steam in any way. -**Paketatutako bertsioa:** 2024.06.08~ynh1 +**Paketatutako bertsioa:** 2024.06.11~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 09e3bc3..be0f74d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Il NE doit PAS être modifié à la main. Cette application est une implémentation en ligne et open source de l’excellent jeu de plateau Terraforming mars. Elle n’est affiliée à FryxGames, Asmodee Digital ou Steam en aucun cas. -**Version incluse :** 2024.06.08~ynh1 +**Version incluse :** 2024.06.11~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index bf65d40..af6b079 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. This is an open-source online implementation of the great board game Terraforming mars. It is not affiliated with FryxGames, Asmodee Digital or Steam in any way. -**Versión proporcionada:** 2024.06.08~ynh1 +**Versión proporcionada:** 2024.06.11~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 1cd63b8..db16b91 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ This is an open-source online implementation of the great board game Terraforming mars. It is not affiliated with FryxGames, Asmodee Digital or Steam in any way. -**分发版本：** 2024.06.08~ynh1 +**分发版本：** 2024.06.11~ynh1 **演示：** From 549eaafd92fd70cbb6126db470c4ffb4c8691d82 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:24:37 +0200 Subject: [PATCH 05/14] remove npm install global --- scripts/install | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index c2110e3..728d69a 100755 --- a/scripts/install +++ b/scripts/install @@ -16,9 +16,6 @@ ynh_script_progression --message="Installing dependencies..." --weight=5 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -# Upgrade NPM -ynh_npm install --global npm@8.1.2 - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -62,6 +59,7 @@ chown $app:$app "$install_dir/.env" pushd $install_dir ynh_use_nodejs + ynh_npm install npm@latest ynh_script_progression --message="npm install... This can be very long, be patient !" --weight=18 ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm ci --quiet --production --prefer-offline --network-timeout=100000 From 0b1c319ec4c3c03be50b659b2af663c7beb7c16c Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:25:21 +0200 Subject: [PATCH 06/14] remove npm install global --- scripts/upgrade | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index ccb8e94..c42c741 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,9 +18,6 @@ ynh_script_progression --message="Installing dependencies..." --weight=5 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -# Upgrade NPM -ynh_npm install --global npm@8.1.2 - #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -60,6 +57,7 @@ chown $app:$app "$install_dir/.env" pushd $install_dir ynh_use_nodejs + ynh_npm install npm@latest ynh_script_progression --message="npm install... This can be very long, be patient !" --weight=18 ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm ci --quiet --production --prefer-offline --network-timeout=100000 @@ -110,4 +108,4 @@ ynh_systemd_action --service_name=$app --action="start" --log_path="/var/log/$ap # END OF SCRIPT #================================================= -ynh_script_progression --message="Upgrade of $app completed" --last \ No newline at end of file +ynh_script_progression --message="Upgrade of $app completed" --last From 102fc81f3a7b2d53247058574fa9c4da7451fd3f Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:27:03 +0200 Subject: [PATCH 07/14] remive npm install global --- scripts/restore | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/restore b/scripts/restore index 9c5f77c..42dc603 100755 --- a/scripts/restore +++ b/scripts/restore @@ -17,8 +17,6 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=10 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version -ynh_npm install --global npm@8.1.2 - #================================================= # RESTORE THE APP MAIN DIR #================================================= @@ -69,4 +67,4 @@ ynh_systemd_action --service_name=nginx --action=reload # END OF SCRIPT #================================================= -ynh_script_progression --message="Restoration completed for $app" --last \ No newline at end of file +ynh_script_progression --message="Restoration completed for $app" --last From bfd84a9d82ab0a1961448c239f73ba9b5835ba69 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:35:05 +0200 Subject: [PATCH 08/14] revert npm to 8.1.2 --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 728d69a..d12c132 100755 --- a/scripts/install +++ b/scripts/install @@ -59,7 +59,7 @@ chown $app:$app "$install_dir/.env" pushd $install_dir ynh_use_nodejs - ynh_npm install npm@latest + ynh_npm install npm@8.1.2 ynh_script_progression --message="npm install... This can be very long, be patient !" --weight=18 ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm ci --quiet --production --prefer-offline --network-timeout=100000 From fd8283ee188c44441ff39462a100e34003ceef5b Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:35:32 +0200 Subject: [PATCH 09/14] revert npm to 8.1.2 --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c42c741..4c79843 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,7 +57,7 @@ chown $app:$app "$install_dir/.env" pushd $install_dir ynh_use_nodejs - ynh_npm install npm@latest + ynh_npm install npm@8.1.2 ynh_script_progression --message="npm install... This can be very long, be patient !" --weight=18 ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm ci --quiet --production --prefer-offline --network-timeout=100000 From a07093322e3a3e35d13e74620c06637869e1c0d7 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:46:50 +0200 Subject: [PATCH 10/14] upgrade nodejs version --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 5fc0a5a..f4c3d97 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -5,7 +5,7 @@ #================================================= # nodejs version -nodejs_version=16.13.2 +nodejs_version="20" #================================================= # PERSONAL HELPERS From 382d53b6e1fbadaf15a1a8a7611f7fddf5f3c6b5 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:55:34 +0200 Subject: [PATCH 11/14] go back to npm latest --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index d12c132..728d69a 100755 --- a/scripts/install +++ b/scripts/install @@ -59,7 +59,7 @@ chown $app:$app "$install_dir/.env" pushd $install_dir ynh_use_nodejs - ynh_npm install npm@8.1.2 + ynh_npm install npm@latest ynh_script_progression --message="npm install... This can be very long, be patient !" --weight=18 ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm ci --quiet --production --prefer-offline --network-timeout=100000 From 270aa4fcde5adf692b2050d482eee6834d26e5d2 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:56:02 +0200 Subject: [PATCH 12/14] go back to npm latest --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4c79843..c42c741 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,7 +57,7 @@ chown $app:$app "$install_dir/.env" pushd $install_dir ynh_use_nodejs - ynh_npm install npm@8.1.2 + ynh_npm install npm@latest ynh_script_progression --message="npm install... This can be very long, be patient !" --weight=18 ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm ci --quiet --production --prefer-offline --network-timeout=100000 From e632bf3ab368f2c26518788dc4b96957cec4cea1 Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 12 Jun 2024 09:08:46 +0200 Subject: [PATCH 13/14] remove npm install npm --- scripts/install | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/install b/scripts/install index 728d69a..6ebb1ed 100755 --- a/scripts/install +++ b/scripts/install @@ -59,7 +59,6 @@ chown $app:$app "$install_dir/.env" pushd $install_dir ynh_use_nodejs - ynh_npm install npm@latest ynh_script_progression --message="npm install... This can be very long, be patient !" --weight=18 ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm ci --quiet --production --prefer-offline --network-timeout=100000 From d46340c0a930625a9e562221a53edcdf90d952de Mon Sep 17 00:00:00 2001 From: Thomas <51749973+Thovi98@users.noreply.github.com> Date: Wed, 12 Jun 2024 09:09:16 +0200 Subject: [PATCH 14/14] remove npm install npm --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index c42c741..2bb8770 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -57,7 +57,6 @@ chown $app:$app "$install_dir/.env" pushd $install_dir ynh_use_nodejs - ynh_npm install npm@latest ynh_script_progression --message="npm install... This can be very long, be patient !" --weight=18 ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm ci --quiet --production --prefer-offline --network-timeout=100000