From a8a28748648c58612068c15c72a6b65f59e225e2 Mon Sep 17 00:00:00 2001 From: nemsia Date: Sun, 15 Oct 2017 10:05:38 +0200 Subject: [PATCH 1/5] Upgrade to 2.0.0 (#56) * Update to 2.0.0 --- README.md | 2 +- manifest.json | 2 +- scripts/upgrade | 23 +++++++++++++++++++---- 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 < 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 From 5295228ca35226fd7c931096ec0e71677f66fd26 Mon Sep 17 00:00:00 2001 From: nemsia Date: Wed, 25 Oct 2017 21:43:05 +0200 Subject: [PATCH 2/5] Fix install on v2 (#58) * Fix install v2.0 ruby version * Fix install on v2 add "SAFETY_ASSURED=1" on .env.production --- scripts/install | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 217ca34..f3ac754 100644 --- a/scripts/install +++ b/scripts/install @@ -122,17 +122,17 @@ COMMANDS # Install ruby-build sudo su - $app <> .env.production RAILS_ENV=production bin/bundle exec rails db:setup RAILS_ENV=production bin/bundle exec rails --trace assets:precompile CCOMMANDS From a8f28533790c40d691327b09f2ac3e42176a6858 Mon Sep 17 00:00:00 2001 From: nemsia Date: Wed, 31 Jan 2018 17:02:43 +0100 Subject: [PATCH 3/5] Upgrade to 2.2.0 (#65) * Upgrade ruby to 2.5.0 * Add remove_regeneration_markers * Update README.md --- README.md | 4 ++-- manifest.json | 2 +- scripts/install | 9 +++++---- scripts/upgrade | 15 +++++++++------ 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index d30e94e..926ab36 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Mastodon for YunoHost -[![Latest Version](https://img.shields.io/badge/version-2.0.0-green.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/releases) +[![Latest Version](https://img.shields.io/badge/version-2.2.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) -[![Yunohost version](https://img.shields.io/badge/yunohost-2.5.6_tested-orange.svg?style=flat)](https://github.com/YunoHost/yunohost) +[![Yunohost version](https://img.shields.io/badge/yunohost-2.7.7_tested-orange.svg?style=flat)](https://github.com/YunoHost/yunohost) [![GitHub issues](https://img.shields.io/github/issues/YunoHost-Apps/mastodon_ynh.svg?style=flat)](https://github.com/YunoHost-Apps/mastodon_ynh/issues) [![Install Mastodon with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=mastodon) diff --git a/manifest.json b/manifest.json index 09da9c0..228fa4b 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": "2.0.0", + "version": "2.2.0", "url": "https://github.com/tootsuite/mastodon", "license": "AGPL v3.0", "maintainer": { diff --git a/scripts/install b/scripts/install index f3ac754..0027f6d 100644 --- a/scripts/install +++ b/scripts/install @@ -122,17 +122,18 @@ COMMANDS # Install ruby-build sudo su - $app < Date: Wed, 31 Jan 2018 20:13:24 +0100 Subject: [PATCH 4/5] Fix rm rb --- scripts/install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index 0027f6d..3d5172f 100644 --- a/scripts/install +++ b/scripts/install @@ -127,7 +127,7 @@ sudo su - $app < Date: Wed, 31 Jan 2018 20:14:01 +0100 Subject: [PATCH 5/5] Fix rm rb --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index ba7b27f..8e33ce8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -76,7 +76,7 @@ $final_path/.rbenv/versions/2.5.0/bin/ruby -v RCOMMANDS # Create symlink for ruby 2.5.0 -sudo rm /usr/bin/ruby +sudo rm /usr/bin/ruby || true sudo ln -s $final_path/.rbenv/versions/2.5.0/bin/ruby /usr/bin/ruby || true # Install Mastodon