diff options
| author | yalh76 <yalh@yahoo.com> | 2020-01-01 15:41:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-01 15:41:36 +0100 |
| commit | 168573d3d7dcc4306691f21d5b64819d1f6dd38c (patch) | |
| tree | 7c221662e992a09a64db3608eab4941ebcb3d539 | |
| parent | 7c299ee01c2e596ae1e89333bb20032ba5dbeef5 (diff) | |
| parent | a85f1bbe2f147fe89098e26a4b17922390eabeeb (diff) | |
| download | mastodon_ynh-168573d3d7dcc4306691f21d5b64819d1f6dd38c.tar.gz mastodon_ynh-168573d3d7dcc4306691f21d5b64819d1f6dd38c.tar.bz2 mastodon_ynh-168573d3d7dcc4306691f21d5b64819d1f6dd38c.zip | |
Merge pull request #187 from YunoHost-Apps/testing
Fix bundler
| -rw-r--r-- | check_process | 1 | ||||
| -rw-r--r-- | manifest.json | 2 | ||||
| -rw-r--r-- | scripts/install | 2 | ||||
| -rw-r--r-- | scripts/restore | 1 | ||||
| -rw-r--r-- | scripts/upgrade | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/check_process b/check_process index b4eef2b..66a0890 100644 --- a/check_process +++ b/check_process @@ -12,7 +12,6 @@ setup_private=0 setup_public=1 upgrade=1 - upgrade=1 from_commit=2987ccf8b3aa393dbef79b874dfe5839a0ee10da backup_restore=1 multi_instance=1 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. diff --git a/manifest.json b/manifest.json index bd1fc77..8991309 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.0.1~ynh1", + "version": "3.0.1~ynh2", "url": "https://github.com/tootsuite/mastodon", "license": "AGPL-3.0-or-later", "maintainer": [ diff --git a/scripts/install b/scripts/install index 2519364..8c903b5 100644 --- a/scripts/install +++ b/scripts/install @@ -149,7 +149,7 @@ ynh_script_progression --message="Installing Ruby..." --weight=424 ynh_install_ruby --ruby_version=2.6.5 /opt/rbenv/versions/2.6.5/bin/gem update --system -#/opt/rbenv/versions/2.6.5/bin/gem install bundler --no-document +/opt/rbenv/versions/2.6.5/bin/gem install bundler:1.17.3 --no-document #================================================= # MODIFY A CONFIG FILE diff --git a/scripts/restore b/scripts/restore index 5982c94..de19461 100644 --- a/scripts/restore +++ b/scripts/restore @@ -114,6 +114,7 @@ ynh_script_progression --message="Installing Ruby..." --weight=393 ynh_install_ruby --ruby_version=2.6.5 /opt/rbenv/versions/2.6.5/bin/gem update --system +/opt/rbenv/versions/2.6.5/bin/gem install bundler:1.17.3 --no-document #================================================= # RESTORE THE POSTGRESQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index edff694..9c7eaf7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -237,7 +237,7 @@ ynh_script_progression --message="Installing Ruby..." --weight=424 ynh_install_ruby --ruby_version=2.6.5 /opt/rbenv/versions/2.6.5/bin/gem update --system -#/opt/rbenv/versions/2.6.5/bin/gem install bundler +/opt/rbenv/versions/2.6.5/bin/gem install bundler:1.17.3 --no-document #================================================= # MODIFY A CONFIG FILE |