diff options
| author | yalh76 <yalh@yahoo.com> | 2022-04-26 21:08:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-26 21:08:14 +0200 |
| commit | 3bcaeda6db21f9bf900530b0553f1c77d59b7829 (patch) | |
| tree | 321082d132ab988df242ac46ad648ed41ab45090 | |
| parent | cfe506676f19f15ccbebb3a5ce392423d8e71af7 (diff) | |
| parent | 3e51844196ff07a1bae7edf9ce1fde93cd25e387 (diff) | |
| download | mastodon_ynh-3bcaeda6db21f9bf900530b0553f1c77d59b7829.tar.gz mastodon_ynh-3bcaeda6db21f9bf900530b0553f1c77d59b7829.tar.bz2 mastodon_ynh-3bcaeda6db21f9bf900530b0553f1c77d59b7829.zip | |
Merge pull request #322 from YunoHost-Apps/testing
Fix Nokogiri dep install
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | README_fr.md | 2 | ||||
| -rw-r--r-- | manifest.json | 2 | ||||
| -rw-r--r-- | scripts/install | 1 | ||||
| -rw-r--r-- | scripts/upgrade | 1 |
5 files changed, 5 insertions, 3 deletions
@@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Mastodon is a free, open-source microblogging social network. It is a decentralized alternative to commercial platforms like Twitter and avoids the risks of a single company monopolizing your communication for commercial purposes. -**Shipped version:** 3.5.1~ynh1 +**Shipped version:** 3.5.1~ynh2 **Demo:** https://joinmastodon.org/ diff --git a/README_fr.md b/README_fr.md index 5385ef3..749c104 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Mastodon est un réseau social de microblog auto-hébergé et open source. C'est une alternative décentralisée aux plates-formes commerciales comme Twitter. Mastodon évite ainsi les risques qu'une seule société monopolise votre communication à des fins commerciales. -**Version incluse :** 3.5.1~ynh1 +**Version incluse :** 3.5.1~ynh2 **Démo :** https://joinmastodon.org/ diff --git a/manifest.json b/manifest.json index 8cfa743..ab59fde 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Libre and federated social network", "fr": "Réseau social libre et fédéré" }, - "version": "3.5.1~ynh1", + "version": "3.5.1~ynh2", "url": "https://github.com/mastodon/mastodon", "upstream": { "license": "AGPL-3.0-or-later", diff --git a/scripts/install b/scripts/install index 696d59e..bb99a57 100644 --- a/scripts/install +++ b/scripts/install @@ -206,6 +206,7 @@ ynh_script_progression --message="Installing Mastodon..." pushd "$final_path/live" ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config deployment 'true' 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 set force_ruby_platform true 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 diff --git a/scripts/upgrade b/scripts/upgrade index 1c24a62..3b8290c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -272,6 +272,7 @@ ynh_script_progression --message="Upgrading Mastodon..." pushd "$final_path/live" ynh_exec_as $app $ynh_ruby_load_path $ld_preload bin/bundle config deployment 'true' 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 set force_ruby_platform true --quiet 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 |