From 98ca07fc47eb67735f1fe4f2f163842c601c2b1e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 15 Feb 2024 06:11:52 +0000 Subject: [PATCH 1/4] Upgrade to v2024.02.14 --- 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 433c464..b9bdb9d 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/810514747b0978241222da53ed6c4adc729a0250.tar.gz -SOURCE_SUM=baa4f7bece99650da499a52e57b6e5f1140eebad7a897402a95e9f4c051d671b +SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/e7ca82762dbcbf3d304437a91778f377e6739980.tar.gz +SOURCE_SUM=04f3078c7c3cf7b24a3137550f467c8ed580355abf4ede061f1ae2c3079b3cae SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=810514747b0978241222da53ed6c4adc729a0250.tar.gz +SOURCE_FILENAME=e7ca82762dbcbf3d304437a91778f377e6739980.tar.gz SOURCE_EXTRACT=true diff --git a/manifest.json b/manifest.json index 056da42..3d0de40 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.18~ynh1", + "version": "2024.02.14~ynh1", "url": "https://github.com/glitch-soc/mastodon", "upstream": { "license": "AGPL-3.0-or-later", From 8ffc0ec61dac7ef3572aaf209ec239bc9ff35241 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 15 Feb 2024 06:12:01 +0000 Subject: [PATCH 2/4] 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 58fdf22..cfc67a8 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.18~ynh1 +**Shipped version:** 2024.02.14~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 13b5ab3..ecba2cc 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.18~ynh1 +**Version incluse :** 2024.02.14~ynh1 ## Avertissements / informations importantes Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs). From 7fcc02e9a00a93a63861e77aac1df26b3244295f Mon Sep 17 00:00:00 2001 From: Alison Date: Thu, 15 Feb 2024 09:46:11 +0100 Subject: [PATCH 3/4] Upgrade dependencies --- scripts/_common.sh | 4 ++-- scripts/install | 4 ++-- scripts/restore | 10 ++++++++-- scripts/upgrade | 4 ++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 8a6641d..f39b044 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,9 +9,9 @@ pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git MEMORY_NEEDED="2560" -RUBY_VERSION="3.2.2" +RUBY_VERSION="3.2.3" -NODEJS_VERSION="16" +NODEJS_VERSION="20" # Workaround for Mastodon on Bullseye # See https://github.com/mastodon/mastodon/issues/15751#issuecomment-873594463 diff --git a/scripts/install b/scripts/install index b56b309..a31966d 100644 --- a/scripts/install +++ b/scripts/install @@ -97,7 +97,6 @@ ynh_script_progression --message="Installing dependencies..." --weight=10 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION -ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_exec_warn_less ynh_install_ruby --ruby_version=$RUBY_VERSION #================================================= @@ -228,7 +227,8 @@ 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 yarn install --pure-lockfile + corepack enable + yarn install echo "SAFETY_ASSURED=1">> $config ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:setup --quiet ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:precompile --quiet diff --git a/scripts/restore b/scripts/restore index 766d553..81931c2 100644 --- a/scripts/restore +++ b/scripts/restore @@ -80,7 +80,6 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=10 # Define and install dependencies ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION -ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_install_ruby --ruby_version=$RUBY_VERSION #================================================= @@ -110,7 +109,7 @@ ynh_script_progression --message="Adding $swap_needed Mo to swap..." --weight=1 ynh_add_swap --size=$swap_needed #================================================= -# INSTALLING RUBY AND BUNDLER +# INSTALLING RUBY, BUNDLER, AND YARN #================================================= ynh_script_progression --message="Installing Ruby dependencies..." --weight=10 @@ -120,6 +119,13 @@ pushd "$final_path/live" ynh_gem install bundler --no-document popd +ynh_script_progression --message="Installing Yarn dependencies..." --weight=10 + +pushd "$final_path/live" + corepack enable + yarn install +popd + #================================================= # RESTORE VARIOUS FILES #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 6083778..57f890a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -275,7 +275,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=10 ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION -ynh_exec_warn_less ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_exec_warn_less ynh_install_ruby --ruby_version=$RUBY_VERSION #================================================= @@ -341,7 +340,8 @@ 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_as $app $ynh_node_load_PATH yarn install --pure-lockfile + corepack enable + yarn install 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 ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate From 4dcf68914cd59ce813f9cc18f055a710e10e1919 Mon Sep 17 00:00:00 2001 From: Alison Date: Thu, 15 Feb 2024 11:27:00 +0100 Subject: [PATCH 4/4] Only clean assets if they exist --- scripts/upgrade | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 57f890a..71bfeb3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -342,7 +342,9 @@ then ynh_use_nodejs corepack enable yarn install - ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:clean + if [ -d "$final_path/live/public/assets" ]; then + ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:clean + fi ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:precompile ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails db:migrate ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl cache clear