From c9c543ee209a29bcde8a367a644f5d5dcb7f7ad2 Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Wed, 9 Aug 2017 23:58:51 +0200
Subject: Add additional package for arm upgrade

---
 scripts/upgrade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts/upgrade')

diff --git a/scripts/upgrade b/scripts/upgrade
index 99ae13f..6726f92 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -64,8 +64,8 @@ if [[ $node_version =~ ^v4.*$  ]]; then
 	sudo apt-get -y install nodejs
 fi
 
-# add additional package for release 1.4
-ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev
+# add additional package for upgrade
+ynh_package_install pkg-config libprotobuf-dev protobuf-compiler libicu-dev libidn11-dev postgresql-server-dev-9.4
 
 # Apply Mastodon upgrade
 sudo su - $app <<COMMANDS
-- 
cgit v1.2.3-70-g09d2


From a92d2b7f30eca840006c11eb6e03475c50ba2326 Mon Sep 17 00:00:00 2001
From: Nemsia <nemsia@nemsia.org>
Date: Mon, 11 Sep 2017 22:49:53 +0200
Subject: Remove prepare_for_foreign_keys task on upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/upgrade')

diff --git a/scripts/upgrade b/scripts/upgrade
index 6726f92..4e84b0d 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -73,7 +73,7 @@ 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 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
-- 
cgit v1.2.3-70-g09d2


From 956dfc4050f72356bf5f3552c29226da122fb3ae Mon Sep 17 00:00:00 2001
From: nemsia <nemsia@nemsia.org>
Date: Wed, 11 Oct 2017 21:44:36 +0200
Subject: Update upgrade

---
 scripts/upgrade | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'scripts/upgrade')

diff --git a/scripts/upgrade b/scripts/upgrade
index e734e97..0c469bb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -50,9 +50,10 @@ PULLCOMMANDS
 
 # Switch branch to tagged release
 cd $final_path/live
+version=$(curl -s https://api.github.com/repos/tootsuite/mastodon/releases/latest | grep tag_name | cut -d\" -f4)
 sudo su - $app <<SWITCHCOMMANDS
 pushd ~/live
-git checkout $(git tag -l | sort -V | tail -n 1)
+git checkout $version
 SWITCHCOMMANDS
 
 # upgrade Node.js v4 to v6
@@ -88,10 +89,6 @@ 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
-- 
cgit v1.2.3-70-g09d2