aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-02-21 19:25:32 +0900
committerGitHub <noreply@github.com>2018-02-21 19:25:32 +0900
commit4120074d3a5bd025b3c1e8e9e35fba76357d6388 (patch)
tree691a7880f9bc6f97d4a75329b5eeacaacf0ce5a0 /.travis.yml
parent9794e85351243cac6d4e78adaba634b8e4ecad0a (diff)
parent00d29e18a36842c0c26f2dd5dc30115e4ea19ed8 (diff)
downloadrails-4120074d3a5bd025b3c1e8e9e35fba76357d6388.tar.gz
rails-4120074d3a5bd025b3c1e8e9e35fba76357d6388.tar.bz2
rails-4120074d3a5bd025b3c1e8e9e35fba76357d6388.zip
Merge pull request #32064 from yahonda/ci_with_jruby_head
CI with `jruby-head` compatible with Ruby 2.4.1
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 164f0c9c7f..2513e87114 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -99,17 +99,17 @@ matrix:
- "GEM=ar:postgresql POSTGRES=9.2"
addons:
postgresql: "9.2"
- - rvm: jruby-9.1.15.0
+ - rvm: jruby-head
jdk: oraclejdk8
env:
- "GEM=ap"
- - rvm: jruby-9.1.15.0
+ - rvm: jruby-head
jdk: oraclejdk8
env:
- "GEM=am,amo,aj"
allow_failures:
- rvm: ruby-head
- - rvm: jruby-9.1.15.0
+ - rvm: jruby-head
- env: "GEM=ac:integration"
fast_finish: true