From a84792b21bd1c4d7105c0f732da1d8d4563cc65c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 30 Dec 2023 06:10:53 +0000 Subject: [PATCH 1/6] Upgrade to v2023.12.29 --- conf/app.src | 6 +++--- manifest.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/conf/app.src b/conf/app.src index d31735f..aa79399 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/ea6c187fca418a4c6bd4353508b0e42848d8f371.tar.gz -SOURCE_SUM=ac8e767a6a64e1608cd299a138e9089407bf612634f9aba0ca66c6eb33b2fc3f +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/6fe978f7d7e1fe2c2e06bb5888bec107c9bed235.tar.gz +SOURCE_SUM=d2d214f27b7be247259e6920f33d1ecb81380903b2351e8705b20886dda2502a SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=ea6c187fca418a4c6bd4353508b0e42848d8f371.tar.gz +SOURCE_FILENAME=6fe978f7d7e1fe2c2e06bb5888bec107c9bed235.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 37afa57..6f17716 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network, fork of Mastodon", "fr": "Réseau social libre et fédéré, scission de Mastodon" }, - "version": "2023.12.22~ynh1", + "version": "2023.12.29~ynh1", "url": "https://github.com/glitch-soc/mastodon", "upstream": { "license": "AGPL-3.0-or-later", From aae4bc5aec97a57ffe730f48951c6fddea6a24a2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 30 Dec 2023 06:10:58 +0000 Subject: [PATCH 2/6] 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 95dc72a..46957b3 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in See more [on the documentation](https://glitch-soc.github.io/docs/). -**Shipped version:** 2023.12.22~ynh1 +**Shipped version:** 2023.12.29~ynh1 ## Disclaimers / important information ⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk! diff --git a/README_fr.md b/README_fr.md index 24c6278..be3b340 100644 --- a/README_fr.md +++ b/README_fr.md @@ -43,7 +43,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais). -**Version incluse :** 2023.12.22~ynh1 +**Version incluse :** 2023.12.29~ynh1 ## Avertissements / informations importantes Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs). From 55cf3b1b96c8ed2b06bdb1902ee44eb886d0f8d6 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 30 Dec 2023 08:49:00 +0100 Subject: [PATCH 3/6] use ynh_npm alias instead --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index f995e6a..6079a72 100644 --- a/scripts/install +++ b/scripts/install @@ -227,7 +227,7 @@ pushd "$final_path/live" ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test' ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH npm i corepack + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH ynh_npm i corepack ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH corepack enable ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH corepack prepare yarn@stable --activate ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH yarn install --pure-lockfile From 889c92bae1d79f0a2e40bfe65ac0e43f7bbaa084 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 30 Dec 2023 08:49:46 +0100 Subject: [PATCH 4/6] use ynh_npm + spacing --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index dbffe47..df70a64 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -340,9 +340,9 @@ then ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test' ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH npm i corepack + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH ynh_npm i corepack ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH corepack enable - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH corepack prepare yarn@stable --activate + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH corepack prepare yarn@stable --activate ynh_exec_as $app $ynh_node_load_PATH yarn install --pure-lockfile ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:clean ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:precompile From a209798331f616fc232a4773bc3df1ea8c834a6c Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 30 Dec 2023 09:14:30 +0100 Subject: [PATCH 5/6] typo --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index df70a64..87b5b9b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -340,7 +340,7 @@ then ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test' ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH ynh_npm i corepack + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm i corepack ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH corepack enable ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH corepack prepare yarn@stable --activate ynh_exec_as $app $ynh_node_load_PATH yarn install --pure-lockfile From b5a6d85e84242023f0515378cf08cdd20d5a5ab9 Mon Sep 17 00:00:00 2001 From: lapineige Date: Sat, 30 Dec 2023 09:14:40 +0100 Subject: [PATCH 6/6] typo --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 6079a72..ec9179a 100644 --- a/scripts/install +++ b/scripts/install @@ -227,7 +227,7 @@ pushd "$final_path/live" ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config without 'development test' ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) ynh_use_nodejs - ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH ynh_npm i corepack + ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH $ynh_npm i corepack ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH corepack enable ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH corepack prepare yarn@stable --activate ynh_exec_warn_less ynh_exec_as $app $ynh_node_load_PATH yarn install --pure-lockfile