From 8ab14654a682bf5d95277ac8123a8eca615fb2bf Mon Sep 17 00:00:00 2001 From: tituspijean Date: Sun, 24 Apr 2022 09:37:43 +0200 Subject: [PATCH 1/3] Fix Nokogiri dep install --- scripts/install | 1 + scripts/upgrade | 1 + 2 files changed, 2 insertions(+) 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 From 04366591ec246b3ceb7316f9a15919c0272c6b2d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Tue, 26 Apr 2022 21:06:10 +0200 Subject: [PATCH 2/3] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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", From 3e51844196ff07a1bae7edf9ce1fde93cd25e387 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 26 Apr 2022 19:06:15 +0000 Subject: [PATCH 3/3] 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 644e423..4a47c04 100644 --- a/README.md +++ b/README.md @@ -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/