diff options
| -rw-r--r-- | manifest.json | 2 | ||||
| -rw-r--r-- | scripts/install | 3 | ||||
| -rw-r--r-- | scripts/upgrade | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/manifest.json b/manifest.json index a38eac9..2792cd4 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Mastodon is a free, open-source social network.", "fr": "Mastodon est un réseau social gratuit et open source." }, - "version": "3.1.2~ynh1", + "version": "3.1.2~ynh2", "url": "https://github.com/tootsuite/mastodon", "license": "AGPL-3.0-or-later", "maintainer": [ diff --git a/scripts/install b/scripts/install index 989954b..7d7d4b8 100644 --- a/scripts/install +++ b/scripts/install @@ -110,6 +110,9 @@ ynh_app_setting_set --app=$app --key=final_path --value=$final_path mkdir $final_path ynh_setup_source --dest_dir="$final_path/live" +# Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292 +ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock" + #================================================= # NGINX CONFIGURATION #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 32426a2..0bc44b3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -184,6 +184,10 @@ then rsync -a "$final_path/live/.env.production" "$tmpdir/." ynh_secure_remove --file="$final_path/live/" ynh_setup_source --dest_dir="$final_path/live" + + # Temporary workaround for https://github.com/tootsuite/mastodon/issues/13292 + ynh_replace_string --match_string="sidekiq-unique-jobs (6.0.18)" --replace_string="sidekiq-unique-jobs (6.0.20)" --target_file="$final_path/live/Gemfile.lock" + if [ -d "$tmpdir/system" ]; then rsync -a "$tmpdir/system" "$final_path/live/public/." fi |