diff options
author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-07-06 14:18:05 -0700 |
---|---|---|
committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-07-06 14:18:05 -0700 |
commit | 5c09d84b7d5f226abe8447853e8915d9ca3e4a93 (patch) | |
tree | 191aa4b7f8afec0e6ca2175afeafefb44dd97c46 | |
parent | d61ca16b0d0609308071215ef2300de1af5a13b0 (diff) | |
download | ffi-yajl-5c09d84b7d5f226abe8447853e8915d9ca3e4a93.tar.gz |
bump jruby/jvm + fix matrix
-rw-r--r-- | .travis.yml | 45 |
1 files changed, 15 insertions, 30 deletions
diff --git a/.travis.yml b/.travis.yml index a206348..7e628ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,44 +8,29 @@ bundler_args: --without development_extras --jobs 3 --retry 3 script: rake compile; rake spec after_success: gem install yajl-ruby; gem install json; gem install psych; FORCE_FFI_YAJL="ext" ffi-yajl-bench language: ruby -rvm: - - 2.3.1 - - 2.2.5 - - ruby-head - - rbx - - jruby-19mode - - jruby-head -jdk: - - openjdk7 - - oraclejdk7 - - openjdk6 matrix: - allow_failures: - - rvm: ruby-head - jdk: oraclejdk7 - - rvm: jruby-head - jdk: oraclejdk7 - - rvm: jruby-head - jdk: openjdk7 - exclude: + include: - rvm: 2.3.1 - jdk: openjdk6 - - rvm: 2.3.1 - jdk: openjdk7 - rvm: 2.2.5 - jdk: openjdk6 - - rvm: 2.2.5 - jdk: openjdk7 - - rvm: rbx - jdk: openjdk6 - - rvm: rbx - jdk: openjdk7 - rvm: ruby-head + - rvm: rbx + - rvm: jruby + jdk: oraclejdk7 + - rvm: jruby + jdk: oraclejdk8 + - rvm: jruby jdk: openjdk6 - - rvm: ruby-head + - rvm: jruby jdk: openjdk7 - rvm: jruby-head + jdk: oraclejdk7 + - rvm: jruby-head + jdk: oraclejdk8 + - rvm: jruby-head jdk: openjdk6 + - rvm: jruby-head + jdk: openjdk7 + branches: only: - master |