Merge pull request #260 from YunoHost-Apps/fix_ci

Fix install and upgrade stuck on corepack yarn install
2024-09-03 19:15:59 +02:00 · 2024-05-19 21:26:04 +02:00 · 2024-05-19 21:26:04 +02:00 · c965f14cf6
commit c965f14cf6
parent eb71df0383 66374406dc
8 changed files with 266 additions and 15 deletions
--- a/ALL_README.md
+++ b/ALL_README.md
@ -1,6 +1,8 @@
 # All available README files by language

 - [Read the README in English](README.md)
+- [Lee 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)
- [Leggi il “README” in italiano](README_it.md)
+- [阅读中文（简体）的 README](README_zh_Hans.md)
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@ It shall NOT be edited by hand.

 [![Install Glitch-Soc with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glitchsoc)

-*[Read this README is other languages.](./ALL_README.md)*
+*[Read this README in other languages.](./ALL_README.md)*

 > *This package allows you to install Glitch-Soc quickly and simply on a YunoHost server.*  
 > *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.*
--- a/README_es.md
+++ b/README_es.md
@ -0,0 +1,83 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Glitch-Soc para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/glitchsoc.svg)](https://dash.yunohost.org/appci/app/glitchsoc) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/glitchsoc.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/glitchsoc.maintain.svg)
+
+[![Instalar Glitch-Soc con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glitchsoc)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarGlitch-Soc rapidamente y simplement en un servidor YunoHost.*  
+> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.*
+
+## Descripción general
+
+`glitch-soc` is a friendly [fork](https://en.wikipedia.org/wiki/Fork_(software_development)) of the open-source social media software [Mastodon](https://joinmastodon.org/), with the aim of providing additional features at the risk of potentially less stable software.
+
+###  What's different from Mastodon?
+
+`glitch-soc` adds a number of experimental features to Mastodon, such as:
+
+- Media improvements
+  - Images inside the CW spoiler
+  - fullwidth images
+  - scaling options
+- Formatted toots
+- Reply selection in lists
+- Filter improvements
+- Highlighting of misleading links
+- Hiding follower count
+- An app settings modal
+- Collapsible toots
+- Toot visibility icons
+- Local-only toots
+- Threaded mode
+- `data-*` attributes on statuses
+- Advanced theming via flavours+skins
+- Doodle
+
+See more [on the documentation](https://glitch-soc.github.io/docs/).
+
+
+**Versión actual:** 2024.03.20~ynh1
+## informaciones importantes
+
+⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk!
+
+### Install
+
+* This app require a dedicated domain or subdomain.
+* The user choosen during the installation is created in Glitch-Soc with admin rights.
+
+LDAP authentication and SSO are enabled. All YunoHost users can authenticate.
+
+We invite you to block remote malicious instances from the administration interface. You can also add text on your home page.
+
+### Known issues
+
+* When logged in with SSO, log-out from YunoHost's portal don't log-out from Glitch-Soc. See https://github.com/YunoHost/issues/issues/501
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://glitch-soc.github.io/docs/>
+- Repositorio del código fuente oficial de la aplicación : <https://github.com/glitch-soc/mastodon>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/glitchsoc>
+- Reportar un error: <https://github.com/YunoHost-Apps/glitchsoc_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/glitchsoc_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/glitchsoc_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade glitchsoc -u https://github.com/YunoHost-Apps/glitchsoc_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>
--- a/README_eu.md
+++ b/README_eu.md
@ -0,0 +1,83 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# Glitch-Soc YunoHost-erako
+
+[![Integrazio maila](https://dash.yunohost.org/integration/glitchsoc.svg)](https://dash.yunohost.org/appci/app/glitchsoc) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/glitchsoc.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/glitchsoc.maintain.svg)
+
+[![Instalatu Glitch-Soc YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glitchsoc)
+
+*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)*
+
+> *Pakete honek Glitch-Soc YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.*  
+> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.*
+
+## Aurreikuspena
+
+`glitch-soc` is a friendly [fork](https://en.wikipedia.org/wiki/Fork_(software_development)) of the open-source social media software [Mastodon](https://joinmastodon.org/), with the aim of providing additional features at the risk of potentially less stable software.
+
+###  What's different from Mastodon?
+
+`glitch-soc` adds a number of experimental features to Mastodon, such as:
+
+- Media improvements
+  - Images inside the CW spoiler
+  - fullwidth images
+  - scaling options
+- Formatted toots
+- Reply selection in lists
+- Filter improvements
+- Highlighting of misleading links
+- Hiding follower count
+- An app settings modal
+- Collapsible toots
+- Toot visibility icons
+- Local-only toots
+- Threaded mode
+- `data-*` attributes on statuses
+- Advanced theming via flavours+skins
+- Doodle
+
+See more [on the documentation](https://glitch-soc.github.io/docs/).
+
+
+**Paketatutako bertsioa:** 2024.03.20~ynh1
+## Ezespena / informazio garrantzitsua
+
+⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk!
+
+### Install
+
+* This app require a dedicated domain or subdomain.
+* The user choosen during the installation is created in Glitch-Soc with admin rights.
+
+LDAP authentication and SSO are enabled. All YunoHost users can authenticate.
+
+We invite you to block remote malicious instances from the administration interface. You can also add text on your home page.
+
+### Known issues
+
+* When logged in with SSO, log-out from YunoHost's portal don't log-out from Glitch-Soc. See https://github.com/YunoHost/issues/issues/501
+
+## Dokumentazioa eta baliabideak
+
+- Aplikazioaren webgune ofiziala: <https://glitch-soc.github.io/docs/>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/glitch-soc/mastodon>
+- YunoHost Denda: <https://apps.yunohost.org/app/glitchsoc>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/glitchsoc_ynh/issues>
+
+## Garatzaileentzako informazioa
+
+Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/glitchsoc_ynh/tree/testing).
+
+`testing` abarra probatzeko, ondorengoa egin:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/glitchsoc_ynh/tree/testing --debug
+edo
+sudo yunohost app upgrade glitchsoc -u https://github.com/YunoHost-Apps/glitchsoc_ynh/tree/testing --debug
+```
+
+**Informazio gehiago aplikazioaren paketatzeari buruz:** <https://yunohost.org/packaging_apps>
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@ -0,0 +1,83 @@
+<!--
+注意：此 README 由 <https://github.com/YunoHost/apps/tree/master/tools/readme_generator> 自动生成
+请勿手动编辑。
+-->
+
+# YunoHost 上的 Glitch-Soc
+
+[![集成程度](https://dash.yunohost.org/integration/glitchsoc.svg)](https://dash.yunohost.org/appci/app/glitchsoc) ![工作状态](https://ci-apps.yunohost.org/ci/badges/glitchsoc.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/glitchsoc.maintain.svg)
+
+[![使用 YunoHost 安装 Glitch-Soc](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=glitchsoc)
+
+*[阅读此 README 的其它语言版本。](./ALL_README.md)*
+
+> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Glitch-Soc。*  
+> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。*
+
+## 概况
+
+`glitch-soc` is a friendly [fork](https://en.wikipedia.org/wiki/Fork_(software_development)) of the open-source social media software [Mastodon](https://joinmastodon.org/), with the aim of providing additional features at the risk of potentially less stable software.
+
+###  What's different from Mastodon?
+
+`glitch-soc` adds a number of experimental features to Mastodon, such as:
+
+- Media improvements
+  - Images inside the CW spoiler
+  - fullwidth images
+  - scaling options
+- Formatted toots
+- Reply selection in lists
+- Filter improvements
+- Highlighting of misleading links
+- Hiding follower count
+- An app settings modal
+- Collapsible toots
+- Toot visibility icons
+- Local-only toots
+- Threaded mode
+- `data-*` attributes on statuses
+- Advanced theming via flavours+skins
+- Doodle
+
+See more [on the documentation](https://glitch-soc.github.io/docs/).
+
+
+**分发版本：** 2024.03.20~ynh1
+## 免责声明 / 重要信息
+
+⚠️ Glitch-Soc is beta software, and under active development. Use at your own risk!
+
+### Install
+
+* This app require a dedicated domain or subdomain.
+* The user choosen during the installation is created in Glitch-Soc with admin rights.
+
+LDAP authentication and SSO are enabled. All YunoHost users can authenticate.
+
+We invite you to block remote malicious instances from the administration interface. You can also add text on your home page.
+
+### Known issues
+
+* When logged in with SSO, log-out from YunoHost's portal don't log-out from Glitch-Soc. See https://github.com/YunoHost/issues/issues/501
+
+## 文档与资源
+
+- 官方应用网站： <https://glitch-soc.github.io/docs/>
+- 上游应用代码库： <https://github.com/glitch-soc/mastodon>
+- YunoHost 商店： <https://apps.yunohost.org/app/glitchsoc>
+- 报告 bug： <https://github.com/YunoHost-Apps/glitchsoc_ynh/issues>
+
+## 开发者信息
+
+请向 [`testing` 分支](https://github.com/YunoHost-Apps/glitchsoc_ynh/tree/testing) 发送拉取请求。
+
+如要尝试 `testing` 分支，请这样操作：
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/glitchsoc_ynh/tree/testing --debug
+或
+sudo yunohost app upgrade glitchsoc -u https://github.com/YunoHost-Apps/glitchsoc_ynh/tree/testing --debug
+```
+
+**有关应用打包的更多信息：** <https://yunohost.org/packaging_apps>
--- a/scripts/install
+++ b/scripts/install
@ -228,13 +228,13 @@ pushd "$final_path/live"
 	ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
 	ynh_use_nodejs
 	corepack enable
-	yarn install
+	COREPACK_ENABLE_DOWNLOAD_PROMPT=0 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
-	ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/bundle exec rake mastodon:webpush:generate_vapid_key > key.txt
-	ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role="Owner" > /dev/null
-	ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production $ynh_ruby_load_path $ld_preload bin/tootctl accounts modify "$admin" --approve
+	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:setup --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
+	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 rake mastodon:webpush:generate_vapid_key > key.txt
+	ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production COREPACK_ENABLE_DOWNLOAD_PROMPT=0 $ynh_ruby_load_path $ld_preload bin/tootctl accounts create "$admin" --email="$admin_mail" --confirmed --role="Owner" > /dev/null
+	ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production COREPACK_ENABLE_DOWNLOAD_PROMPT=0 $ynh_ruby_load_path $ld_preload bin/tootctl accounts modify "$admin" --approve
 popd

 vapid_private_key=$(grep -oP "VAPID_PRIVATE_KEY=\K.+" "$final_path/live/key.txt")
--- a/scripts/restore
+++ b/scripts/restore
@ -123,7 +123,7 @@ ynh_script_progression --message="Installing Yarn dependencies..." --weight=10

 pushd "$final_path/live"
 	corepack enable
-	yarn install
+	COREPACK_ENABLE_DOWNLOAD_PROMPT=0 yarn install
 popd

 #=================================================
--- a/scripts/upgrade
+++ b/scripts/upgrade
@ -243,7 +243,7 @@ then
 	fi
 	rsync -a "$config" "$tmpdir/."
 	ynh_secure_remove --file="$final_path/live"
-	
+
 	ynh_setup_source --dest_dir="$final_path/live"

 	if [ -d "$final_path/system.tmp" ]; then
@ -341,13 +341,13 @@ then
 		ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle install -j$(getconf _NPROCESSORS_ONLN)
 		ynh_use_nodejs
 		corepack enable
-		yarn install
+		COREPACK_ENABLE_DOWNLOAD_PROMPT=0 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
+			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: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
+		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
+		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
+		ynh_exec_warn_less ynh_exec_as $app RAILS_ENV=production COREPACK_ENABLE_DOWNLOAD_PROMPT=0 $ynh_ruby_load_path $ld_preload bin/tootctl cache clear
 	popd
 fi