YunoHost-Apps/glitchsoc_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/glitchsoc_ynh.git synced 2024-09-03 19:15:59 +02:00
Code Issues Activity Actions 1

Merge pull request #223 from AlisonSelby/testing

Browse source 
Upgrade dependencies and include critical security update
This commit is contained in:
OniriCorpe 2024-02-15 22:23:55 +01:00 committed by GitHub
commit ee864e19cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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/). 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 ## Disclaimers / important information
⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk! ⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk!

2
README_fr.md
View file

@ -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). 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 ## Avertissements / informations importantes
Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs). Glitch-Soc est en constant développement, fournis avec les dernières fonctionnalités (incluant les derniers bugs).

6
conf/app.src
View file

@ -1,7 +1,7 @@
SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/810514747b0978241222da53ed6c4adc729a0250.tar.gz SOURCE_URL=https://github.com/glitch-soc/mastodon/archive/e7ca82762dbcbf3d304437a91778f377e6739980.tar.gz
SOURCE_SUM=baa4f7bece99650da499a52e57b6e5f1140eebad7a897402a95e9f4c051d671b SOURCE_SUM=04f3078c7c3cf7b24a3137550f467c8ed580355abf4ede061f1ae2c3079b3cae
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true
SOURCE_FILENAME=810514747b0978241222da53ed6c4adc729a0250.tar.gz SOURCE_FILENAME=e7ca82762dbcbf3d304437a91778f377e6739980.tar.gz
SOURCE_EXTRACT=true SOURCE_EXTRACT=true

2
manifest.json
View file

@ -6,7 +6,7 @@
"en": "Libre and federated social network, fork of Mastodon", "en": "Libre and federated social network, fork of Mastodon",
"fr": "Réseau social libre et fédéré, scission de 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", "url": "https://github.com/glitch-soc/mastodon",
"upstream": { "upstream": {
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",

4
scripts/_common.sh
View file

@ -9,9 +9,9 @@ pkg_dependencies="imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git
MEMORY_NEEDED="2560" MEMORY_NEEDED="2560"
RUBY_VERSION="3.2.2" RUBY_VERSION="3.2.3"
NODEJS_VERSION="16" NODEJS_VERSION="20"
# Workaround for Mastodon on Bullseye # Workaround for Mastodon on Bullseye
# See https://github.com/mastodon/mastodon/issues/15751#issuecomment-873594463 # See https://github.com/mastodon/mastodon/issues/15751#issuecomment-873594463

4
scripts/install
View file

@ -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_app_dependencies $pkg_dependencies
ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION 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 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 config without 'development test'
ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
ynh_use_nodejs 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 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 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 ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:precompile --quiet

10
scripts/restore
View file

@ -80,7 +80,6 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=10
# Define and install dependencies # Define and install dependencies
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies 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_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 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 ynh_add_swap --size=$swap_needed
#================================================= #=================================================
# INSTALLING RUBY AND BUNDLER # INSTALLING RUBY, BUNDLER, AND YARN
#================================================= #=================================================
ynh_script_progression --message="Installing Ruby dependencies..." --weight=10 ynh_script_progression --message="Installing Ruby dependencies..." --weight=10
@ -120,6 +119,13 @@ pushd "$final_path/live"
ynh_gem install bundler --no-document ynh_gem install bundler --no-document
popd popd
ynh_script_progression --message="Installing Yarn dependencies..." --weight=10
pushd "$final_path/live"
corepack enable
yarn install
popd
#================================================= #=================================================
# RESTORE VARIOUS FILES # RESTORE VARIOUS FILES
#================================================= #=================================================

8
scripts/upgrade
View file

@ -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_app_dependencies $pkg_dependencies
ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION 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 ynh_exec_warn_less ynh_install_ruby --ruby_version=$RUBY_VERSION
#================================================= #=================================================
@ -341,8 +340,11 @@ 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 config without 'development test'
ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN) ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
ynh_use_nodejs ynh_use_nodejs
ynh_exec_as $app $ynh_node_load_PATH yarn install --pure-lockfile corepack enable
ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rails assets:clean yarn install
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 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/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 ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl cache clear