From 70a4f54399073ece583aeb1c37dde7cc5520b8ee Mon Sep 17 00:00:00 2001 From: Devin Howard Date: Mon, 1 Aug 2016 08:33:45 +0800 Subject: [PATCH] switch to ruby 2.3.0 (#572) --- .ruby-version | 2 +- .travis.yml | 2 +- Gemfile | 2 +- Vagrantfile | 2 +- doc/MacInstallation.md | 4 ++-- doc/production/first-deploy.md | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ruby-version b/.ruby-version index ac2cdeba..276cbf9e 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.1.3 +2.3.0 diff --git a/.travis.yml b/.travis.yml index 03620177..5e192554 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ cache: directories: - app/assets/javascripts/node_modules rvm: - - 2.1.3 + - 2.3.0 before_script: - echo "Rspec setup" - export RAILS_ENV=test diff --git a/Gemfile b/Gemfile index 7dc8035b..6be2271b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '2.1.3' +ruby '2.3.0' gem 'rails' diff --git a/Vagrantfile b/Vagrantfile index 23f1e8f4..52e040cf 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -9,7 +9,7 @@ sudo apt-get install git curl -y # rvm and ruby su - vagrant -c 'curl -sSL https://rvm.io/mpapis.asc | gpg --import -' -su - vagrant -c 'curl -sSL https://get.rvm.io | bash -s stable --ruby=2.1.3' +su - vagrant -c 'curl -sSL https://get.rvm.io | bash -s stable --ruby=2.3.0' # install some other deps sudo apt-get install nodejs -y diff --git a/doc/MacInstallation.md b/doc/MacInstallation.md index 2881f585..f3470170 100644 --- a/doc/MacInstallation.md +++ b/doc/MacInstallation.md @@ -7,8 +7,8 @@ Some of these steps are pulled from http://www.moncefbelyamani.com/how-to-instal Install homebrew \curl -sSL https://get.rvm.io | bash -s stable --rails - rvm install 2.1.3 --with-gcc=clang - rvm use 2.1.3 + rvm install 2.3.0 --with-gcc=clang + rvm use 2.3.0 gem install lunchy Now install homebrew. diff --git a/doc/production/first-deploy.md b/doc/production/first-deploy.md index 630ac7ce..b46f9c47 100644 --- a/doc/production/first-deploy.md +++ b/doc/production/first-deploy.md @@ -100,8 +100,8 @@ Put the following code into `/etc/init/metamaps_delayed_worker.conf`: chdir /home/metamaps/metamaps env HOME=/home/metamaps - env PATH="/usr/local/rvm/gems/ruby-2.1.3@metamaps/bin:/usr/local/rvm/gems/ruby-2.1.3@global/bin:/usr/local/rvm/rubies/ruby-2.1.3/bin:/usr/local/rvm/bin:/usr/local/bin:/usr/bin:/bin" - env GEM_PATH="/usr/local/rvm/gems/ruby-2.1.3@metamaps:/usr/local/rvm/gems/ruby-2.1.3@global" + env PATH="/usr/local/rvm/gems/ruby-2.3.0@metamaps/bin:/usr/local/rvm/gems/ruby-2.3.0@global/bin:/usr/local/rvm/rubies/ruby-2.3.0/bin:/usr/local/rvm/bin:/usr/local/bin:/usr/bin:/bin" + env GEM_PATH="/usr/local/rvm/gems/ruby-2.3.0@metamaps:/usr/local/rvm/gems/ruby-2.3.0@global" env RAILS_ENV="production" respawn