aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-06-19 14:47:06 -0400
committerGitHub <noreply@github.com>2017-06-19 14:47:06 -0400
commit44c269a5b48a73e9d8b3d6a0688cbc4f4ca877a7 (patch)
tree22168ad67437f41999be19391466ae7e22711844
parent33b596709388cc48d90ab6d1de99d7bd6e85f916 (diff)
parentc778ded45ec1e9eec46881c323dba637ad89c891 (diff)
downloadrails-44c269a5b48a73e9d8b3d6a0688cbc4f4ca877a7.tar.gz
rails-44c269a5b48a73e9d8b3d6a0688cbc4f4ca877a7.tar.bz2
rails-44c269a5b48a73e9d8b3d6a0688cbc4f4ca877a7.zip
Merge pull request #29499 from koic/ci_against_jruby_9_1_12_0
CI against JRuby 9.1.12.0
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index de708c509c..847e11900a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -98,17 +98,17 @@ matrix:
- "GEM=ar:postgresql POSTGRES=9.2"
addons:
postgresql: "9.2"
- - rvm: jruby-9.1.10.0
+ - rvm: jruby-9.1.12.0
jdk: oraclejdk8
env:
- "GEM=ap"
- - rvm: jruby-9.1.10.0
+ - rvm: jruby-9.1.12.0
jdk: oraclejdk8
env:
- "GEM=am,amo,aj"
allow_failures:
- rvm: ruby-head
- - rvm: jruby-9.1.10.0
+ - rvm: jruby-9.1.12.0
- env: "GEM=ac:integration"
fast_finish: true