diff --git a/.travis.yml b/.travis.yml index 64d37609c53..9c2e282d89c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ env: - DISCOURSE_HOSTNAME=www.example.com - RUBY_GC_MALLOC_LIMIT=50000000 matrix: + - "RAILS42=1" - "RAILS_MASTER=1" - "RAILS_MASTER=0" @@ -14,6 +15,7 @@ addons: matrix: allow_failures: - env: "RAILS_MASTER=1" + - env: "RAILS42=1" - rvm: rbx-2 fast_finish: true @@ -37,6 +39,9 @@ before_install: before_script: - bundle exec rake db:create db:migrate -bundler_args: --without development --deployment --retry=3 --jobs=3 +install: + - bash -c "if [ '$RAILS42' == '1' ]; then bundle update --retry=3 --jobs=3 rails rails-observers; fi" + - bash -c "if [ '$RAILS_MASTER' == '1' ]; then bundle update --retry=3 --jobs=3 arel rails rails-observers seed-fu; fi" + - bash -c "if [ '$RAILS_MASTER' == '0' ]; then bundle install --without development --deployment --retry=3 --jobs=3; fi" script: 'bundle exec rspec && bundle exec rake plugin:spec && bundle exec rake qunit:test'