diff options
| author | Andrew White <andrew.white@unboxed.co> | 2016-11-03 13:33:14 +0000 |
|---|---|---|
| committer | Andrew White <andrew.white@unboxed.co> | 2016-11-03 13:33:14 +0000 |
| commit | bbe5e07f7a01d4c12767750e6280ce8f56d89070 (patch) | |
| tree | 5059be0a4d50dcaccb3f0b11d41311d49be4b943 | |
| parent | 47d588246e8d7618b2c6ff810b3ece6624acd25c (diff) | |
| download | rails-bbe5e07f7a01d4c12767750e6280ce8f56d89070.tar.gz rails-bbe5e07f7a01d4c12767750e6280ce8f56d89070.tar.bz2 rails-bbe5e07f7a01d4c12767750e6280ce8f56d89070.zip | |
Update travis.yml to match master where appropriate
| -rw-r--r-- | .travis.yml | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml index 6e1ab6c4f0..d1f24208a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,24 +7,40 @@ cache: services: - memcached -script: 'ci/travis.rb' +bundler_args: --without test --jobs 3 --retry 3 before_install: - gem install bundler + +before_script: + - bundle update + +script: 'ci/travis.rb' + +env: + matrix: + - "GEM=railties" + - "GEM=ap,am,amo,ares,as" + - "GEM=ar:mysql" + - "GEM=ar:mysql2" + - "GEM=ar:sqlite3" + - "GEM=ar:postgresql" + rvm: - 1.8.7 - 1.9.2 - 1.9.3 - 2.0.0 - - 2.1 - - 2.2 - - 2.3 -env: - - "GEM=railties" - - "GEM=ap,am,amo,ares,as" - - "GEM=ar:mysql" - - "GEM=ar:mysql2" - - "GEM=ar:sqlite3" - - "GEM=ar:postgresql" + - 2.1.8 + - 2.2.5 + - 2.3.1 + +# Railties specs on Ruby 1.8.7 are broken. +# Last recorded passing CI run is https://travis-ci.org/rails/rails/builds/48782330 +matrix: + allow_failures: + - rvm: 1.8.7 + env: GEM=railties + notifications: email: false irc: @@ -37,11 +53,3 @@ notifications: on_failure: always rooms: - secure: "YA1alef1ESHWGFNVwvmVGCkMe4cUy4j+UcNvMUESraceiAfVyRMAovlQBGs6\n9kBRm7DHYBUXYC2ABQoJbQRLDr/1B5JPf/M8+Qd7BKu8tcDC03U01SMHFLpO\naOs/HLXcDxtnnpL07tGVsm0zhMc5N8tq4/L3SHxK7Vi+TacwQzI=" -bundler_args: --path vendor/bundle - -# Railties specs on Ruby 1.8.7 are broken. -# Last recorded passing CI run is https://travis-ci.org/rails/rails/builds/48782330 -matrix: - allow_failures: - - rvm: 1.8.7 - env: GEM=railties |