diff options
| author | mo khan <mo@mokhan.ca> | 2015-05-18 11:12:48 -0700 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2015-05-18 11:12:48 -0700 |
| commit | ee1cf483f1c8c3286bac807fe4e9b07351dfc2c8 (patch) | |
| tree | 46618b8de2114a4e04df17037a585a7398190642 | |
| parent | 9dad995a611cb4ac36d2b400f3906213225dd0e5 (diff) | |
use ruby 2.2.2
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | bin/bootstrap-vagrant-user.sh | 4 |
3 files changed, 4 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index e3f4ae4..dcd454f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,9 @@ language: ruby rvm: - - 2.2.0 + - 2.2.2 cache: bundler addons: postgresql: '9.3' before_script: - cp config/database.yml.travis config/database.yml - psql -c 'create database app_test;' -U postgres -deploy: - provider: heroku - api_key: - secure: ERPmKbyLqSCKpZ7uKPoEchI2Er+3a9beGFhs1EpLbfsqsBOszcyzNLqFE8eq3mj9dbhvshSOJWiY1ERiLtwfhlHbpT3yRqnOze6Evhilo5n8OQk1J+5Qp6F9vQuw6na7XYSnU1LxdBT4CDQO9TMv74z/f6brR1W/OZlb0szWAIA= - app: supplycrow - on: - repo: speasley/supplycrow - run: "rake db:migrate" @@ -1,5 +1,5 @@ source 'https://rubygems.org' -ruby '2.2.0' +ruby '2.2.2' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' gem 'rails', '4.2.0' diff --git a/bin/bootstrap-vagrant-user.sh b/bin/bootstrap-vagrant-user.sh index e34674e..b42a110 100644 --- a/bin/bootstrap-vagrant-user.sh +++ b/bin/bootstrap-vagrant-user.sh @@ -7,8 +7,8 @@ git clone https://github.com/tpope/rbenv-ctags.git ~/.rbenv/plugins/rbenv-ctags git clone https://github.com/rkh/rbenv-update.git ~/.rbenv/plugins/rbenv-update git clone https://github.com/sstephenson/rbenv-gem-rehash.git ~/.rbenv/plugins/rbenv-gem-rehash rbenv update -rbenv install 2.2.0 -rbenv global 2.2.0 +rbenv install 2.2.2 +rbenv global 2.2.2 gem install bundler --no-ri --no-rdoc cd /vagrant bundle install -j 2 |