Merge branch 'ci-auto-update-2024.06.09' into fix-install-encryption-init

ALL_README.md

@@ -1,7 +1,7 @@
 # All available README files by language
 
 - [Read the README in English](README.md)
-- [Lee el README en español](README_es.md)
+- [Lea el README en español](README_es.md)
 - [Irakurri README euskaraz](README_eu.md)
 - [Lire le README en français](README_fr.md)
 - [Le o README en galego](README_gl.md)

README.md

@@ -45,7 +45,7 @@ It shall NOT be edited by hand.
 See more [on the documentation](https://glitch-soc.github.io/docs/).
 
 
-**Shipped version:** 2024.03.20~ynh1
+**Shipped version:** 2024.06.09~ynh1
 ## Documentation and resources
 
 - Official app website: <https://glitch-soc.github.io/docs/>

README_es.md

@@ -45,7 +45,7 @@ No se debe editar a mano.
 See more [on the documentation](https://glitch-soc.github.io/docs/).
 
 
-**Versión actual:** 2024.03.20~ynh1
+**Versión actual:** 2024.06.09~ynh1
 ## Documentaciones y recursos
 
 - Sitio web oficial: <https://glitch-soc.github.io/docs/>

README_eu.md

@@ -45,7 +45,7 @@ EZ editatu eskuz.
 See more [on the documentation](https://glitch-soc.github.io/docs/).
 
 
-**Paketatutako bertsioa:** 2024.03.20~ynh1
+**Paketatutako bertsioa:** 2024.06.09~ynh1
 ## Dokumentazioa eta baliabideak
 
 - Aplikazioaren webgune ofiziala: <https://glitch-soc.github.io/docs/>

README_fr.md

@@ -45,7 +45,7 @@ Il NE doit PAS être modifié à la main.
 Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais).
 
 
-**Version incluse :** 2024.03.20~ynh1
+**Version incluse :** 2024.06.09~ynh1
 ## Documentations et ressources
 
 - Site officiel de l’app : <https://glitch-soc.github.io/docs/>

README_gl.md

@@ -45,7 +45,7 @@ NON debe editarse manualmente.
 See more [on the documentation](https://glitch-soc.github.io/docs/).
 
 
-**Versión proporcionada:** 2024.03.20~ynh1
+**Versión proporcionada:** 2024.06.09~ynh1
 ## Documentación e recursos
 
 - Web oficial da app: <https://glitch-soc.github.io/docs/>

README_zh_Hans.md

@@ -45,7 +45,7 @@
 See more [on the documentation](https://glitch-soc.github.io/docs/).
 
 
-**分发版本：** 2024.03.20~ynh1
+**分发版本：** 2024.06.09~ynh1
 ## 文档与资源
 
 - 官方应用网站： <https://glitch-soc.github.io/docs/>

manifest.toml

@@ -7,7 +7,7 @@ name = "Glitch-Soc"
 description.en = "Libre and federated social network, fork of Mastodon"
 description.fr = "Réseau social libre et fédéré, scission de Mastodon"
 
-version = "2024.03.20~ynh1"
+version = "2024.06.09~ynh1"
 
 maintainers = ["Tagada"]
 
@@ -50,8 +50,8 @@ ram.runtime = "500M"
 [resources]
     [resources.sources]
         [resources.sources.main]
-        url = "https://github.com/glitch-soc/mastodon/archive/3341db939cd077820ad598b0445d02ab2382eaf4.tar.gz"
+        url = "https://github.com/glitch-soc/mastodon/archive/1b08c43fcdbab724386051c6254c20345bd3a63e.tar.gz"
-        sha256 = "abf095bbf7f879d35b3e62f3fd4f339ff99b6aac98023fcc836baccfe91a0b97"
+        sha256 = "f24c951aaaaad3fbf7f436c4b1255a5c03776e94c6b1e91f9607c1bc8ed4cf9b"
 
         autoupdate.strategy = "latest_github_commit"
 

scripts/install

@@ -132,7 +132,7 @@ pushd "$install_dir/live"
 	# This export might be removed in yunohost 12
 	COREPACK_ENABLE_DOWNLOAD_PROMPT=0 yarn install
 	echo "SAFETY_ASSURED=1">> "$config"
-	ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production COREPACK_ENABLE_DOWNLOAD_PROMPT=0 "$ynh_ruby_load_path" "$ld_preload" bin/bundle exec rails db:encryption:init --quiet
+	ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production COREPACK_ENABLE_DOWNLOAD_PROMPT=0 "$ynh_ruby_load_path" "$ld_preload" bin/bundle exec rails db:encryption:init
 	ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production COREPACK_ENABLE_DOWNLOAD_PROMPT=0 "$ynh_ruby_load_path" "$ld_preload" bin/bundle exec rails db:migrate --quiet
 	ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production COREPACK_ENABLE_DOWNLOAD_PROMPT=0 "$ynh_ruby_load_path" "$ld_preload" bin/bundle exec rails assets:precompile --quiet
 	# Generate vapid keys

scripts/upgrade

@@ -10,20 +10,6 @@ source /usr/share/yunohost/helpers
 
 config="$install_dir/live/.env.production"
 
-#=================================================
-# ENSURE DOWNWARD COMPATIBILITY
-#=================================================
-ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
-
-# Set `service` settings to support `yunohost app shell` command
-if [[ -z "${service:-}" ]]; then
-	service="$app-web.service"
-	ynh_app_setting_set --app="$app" --key=service --value="$service"
-fi
-
-#Remove previous added repository
-ynh_remove_extra_repo
-
 #=================================================
 # STOP SYSTEMD SERVICE
 #=================================================
@@ -40,6 +26,24 @@ if [[ $db_name = *'_production' ]]; then
 	ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 fi
 
+#=================================================
+# ENSURE DOWNWARD COMPATIBILITY
+#=================================================
+ynh_script_progression --message="Ensuring downward compatibility..." --weight=1
+
+# Set `service` settings to support `yunohost app shell` command
+if [[ -z "${service:-}" ]]; then
+	service="$app-web.service"
+	ynh_app_setting_set --app="$app" --key=service --value="$service"
+fi
+
+#Remove previous added repository
+ynh_remove_extra_repo
+
+if ynh_compare_current_package_version --comparison lt --version 2024.05.01~ynh1; then
+	ynh_exec_warn_less ynh_exec_as "$app" RAILS_ENV=production COREPACK_ENABLE_DOWNLOAD_PROMPT=0 "$ynh_ruby_load_path" "$ld_preload" bin/bundle exec rails db:encryption:init
+fi
+
 #=================================================
 # ADD SWAP IF NEEDED
 #=================================================