diff options
| author | Leonel Galán <leonel@getstealz.com> | 2017-05-17 15:23:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 15:23:21 -0400 |
| commit | 0804e58e1e6a52190a950f863622102b6b21ccb8 (patch) | |
| tree | a2d9887906bd2c472edc54907362b93a57f52f0f /.travis.yml | |
| parent | f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76 (diff) | |
| parent | 385d9af299fbfac7f063de214d371545bafef5df (diff) | |
| download | rails-0804e58e1e6a52190a950f863622102b6b21ccb8.tar.gz rails-0804e58e1e6a52190a950f863622102b6b21ccb8.tar.bz2 rails-0804e58e1e6a52190a950f863622102b6b21ccb8.zip | |
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 5b8cfa9dbf..9d63fd4b13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,14 +15,11 @@ services: addons: postgresql: "9.4" - apt: - packages: - - postgresql-9.4 bundler_args: --without test --jobs 3 --retry 3 before_install: - "rm ${BUNDLE_GEMFILE}.lock" - - "gem update --system" + - "gem update --system 2.6.11" - "gem update bundler" - "[ -f /tmp/beanstalkd-1.10/Makefile ] || (curl -L https://github.com/kr/beanstalkd/archive/v1.10.tar.gz | tar xz -C /tmp)" - "pushd /tmp/beanstalkd-1.10 && make && (./beanstalkd &); popd" @@ -101,17 +98,17 @@ matrix: - "GEM=ar:postgresql POSTGRES=9.2" addons: postgresql: "9.2" - - rvm: jruby-9.1.8.0 + - rvm: jruby-9.1.9.0 jdk: oraclejdk8 env: - "GEM=ap" - - rvm: jruby-9.1.8.0 + - rvm: jruby-9.1.9.0 jdk: oraclejdk8 env: - "GEM=am,amo,aj" allow_failures: - rvm: ruby-head - - rvm: jruby-9.1.8.0 + - rvm: jruby-9.1.9.0 - env: "GEM=ac:integration" fast_finish: true |