Merge pull request #3400 from zzakcanncode/travis_cleanup

Update travis config file
This commit is contained in:
Sam 2015-04-28 07:53:45 +10:00
commit 674cc1edb7

View File

@ -13,16 +13,14 @@ addons:
matrix: matrix:
allow_failures: allow_failures:
- rvm: 2.0.0 - env: "RAILS_MASTER=1"
env: "RAILS_MASTER=1"
- rvm: 2.1
env: "RAILS_MASTER=1"
- rvm: rbx-2 - rvm: rbx-2
fast_finish: true fast_finish: true
rvm: rvm:
- 2.0.0 - 2.0.0
- 2.1 - 2.1
- 2.2
- rbx-2 - rbx-2
services: services:
@ -37,8 +35,7 @@ before_install:
- jshint . - jshint .
before_script: before_script:
- psql -c 'create database discourse_test;' -U postgres - bundle exec rake db:create db:migrate
- bundle exec rake db:migrate
bundler_args: --without development --deployment --retry=3 --jobs=3 bundler_args: --without development --deployment --retry=3 --jobs=3