diff options
| author | Leonel Galán <leonel@getstealz.com> | 2017-04-25 10:39:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 10:39:46 -0500 |
| commit | f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76 (patch) | |
| tree | 4afabfef205d5fbd546946a16bc6cf5eb36279e9 /.travis.yml | |
| parent | 8648f289f01656b2258687126108c389127108e0 (diff) | |
| parent | b32d64df5e5160e25804c7019e2da76bd115f3a6 (diff) | |
| download | rails-f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76.tar.gz rails-f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76.tar.bz2 rails-f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76.zip | |
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index af19cd41de..5b8cfa9dbf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,9 +93,14 @@ matrix: - "GEM=ar:mysql2 MYSQL=mariadb" addons: mariadb: 10.0 - - rvm: 2.4.1 + - rvm: 2.3.4 env: - "GEM=ar:sqlite3_mem" + - rvm: 2.3.4 + env: + - "GEM=ar:postgresql POSTGRES=9.2" + addons: + postgresql: "9.2" - rvm: jruby-9.1.8.0 jdk: oraclejdk8 env: @@ -104,12 +109,6 @@ matrix: jdk: oraclejdk8 env: - "GEM=am,amo,aj" - # Test with old (< 9.4.2) postgresql - - rvm: 2.4.1 - env: - - "GEM=ar:postgresql" - addons: - postgresql: "9.4" allow_failures: - rvm: ruby-head - rvm: jruby-9.1.8.0 |