aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--manifest.json2
-rw-r--r--scripts/upgrade23
3 files changed, 21 insertions, 6 deletions
diff --git a/README.md b/README.md
index 683eb05..d30e94e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# Mastodon for YunoHost
-[![Latest Version](https://img.shields.io/badge/version-1.6.0-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
+[![Latest Version](https://img.shields.io/badge/version-2.0.0-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases)
[![Status](https://img.shields.io/badge/status-testing-yellow.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/milestones)
[![Dependencies](https://img.shields.io/badge/dependencies-includes-lightgrey.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh#dependencies)
[![GitHub license](https://img.shields.io/badge/license-GPLv3-blue.svg?style=flat)](https://raw.githubusercontent.com/YunoHost-Apps/mastodon_ynh/master/LICENSE)
diff --git a/manifest.json b/manifest.json
index 009b5df..09da9c0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -9,7 +9,7 @@
"en": "Mastodon is a free, open-source social network.",
"fr": "Mastodon est un réseau social gratuit et open source."
},
- "version": "1.6.0",
+ "version": "2.0.0",
"url": "https://github.com/tootsuite/mastodon",
"license": "AGPL v3.0",
"maintainer": {
diff --git a/scripts/upgrade b/scripts/upgrade
index 6726f92..0c469bb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -67,13 +67,28 @@ fi
# add additional package for upgrade
ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev postgresql-server-dev-9.4
+# Install ruby 2.4.2 for release 2.0
+sudo su - $app <<RCOMMANDS
+cd $final_path/.rbenv && git pull && cd -
+cd $final_path/.rbenv/plugins/ruby-build && git pull && cd -
+$final_path/.rbenv/bin/rbenv install 2.4.2 || true
+$final_path/.rbenv/versions/2.4.2/bin/ruby -v
+RCOMMANDS
+
+# Create symlink for ruby 2.4.2
+sudo ln -s $final_path/.rbenv/versions/2.4.2/bin/ruby /usr/bin/ruby || true
+
+# Install Mastodon
+sudo su - $app <<MCOMMANDS
+pushd ~/live
+$final_path/.rbenv/versions/2.4.2/bin/gem install bundler
+bin/bundle install --deployment --without development test
+yarn install --pure-lockfile
+MCOMMANDS
+
# Apply Mastodon upgrade
sudo su - $app <<COMMANDS
pushd ~/live
-bin/bundle install
-yarn install --pure-lockfile
-# For 1.4.1 -> 1.4.2 migration prepare_for_foreign_keys is needed
-RAILS_ENV=production bundle exec rails mastodon:maintenance:prepare_for_foreign_keys
RAILS_ENV=production bundle exec rails assets:clean
RAILS_ENV=production bundle exec rails assets:precompile
RAILS_ENV=production bundle exec rails db:migrate