diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2014-06-04 21:25:32 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2014-06-04 21:25:32 -0700 |
| commit | 04909eb5927bd4234f08f268a6ff18306374b393 (patch) | |
| tree | 1f75e054b3493aa69fd97cdc736e697bfb6b3b78 /.travis.yml | |
| parent | 2c8c47c2f08dcfaa1727c29dbefe247278898a9b (diff) | |
| download | ffi-yajl-04909eb5927bd4234f08f268a6ff18306374b393.tar.gz | |
update travis with libyajl2-gem's new matrix
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 46 |
1 files changed, 8 insertions, 38 deletions
diff --git a/.travis.yml b/.travis.yml index 0e81607..2cf764e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ 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.1.2 - 2.1.1 - 2.1.0 - 2.0.0 @@ -17,8 +18,6 @@ rvm: - 1.8.7 - ruby-head - ree - - rbx-2.0 - - rbx-2.1 - rbx-2.2 - jruby-19mode - jruby-18mode @@ -29,76 +28,47 @@ jdk: - openjdk6 matrix: exclude: + - rvm: 2.1.2 + jdk: openjdk6 + - rvm: 2.1.2 + jdk: openjdk7 - rvm: 2.1.1 jdk: openjdk6 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: 2.1.1 jdk: openjdk7 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: 2.1.0 jdk: openjdk6 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: 2.1.0 jdk: openjdk7 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: 2.0.0 jdk: openjdk6 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: 2.0.0 jdk: openjdk7 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: 1.9.3 jdk: openjdk6 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: 1.9.3 jdk: openjdk7 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: 1.9.2 jdk: openjdk6 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: 1.9.2 jdk: openjdk7 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: 1.8.7 jdk: openjdk6 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: 1.8.7 jdk: openjdk7 - env: JRUBY_OPTS="-Xcext.enabled=true" - - rvm: rbx-2.0 - jdk: openjdk6 - env: JRUBY_OPTS="-Xcext.enabled=true" - - rvm: rbx-2.0 - jdk: openjdk7 - env: JRUBY_OPTS="-Xcext.enabled=true" - - rvm: rbx-2.1 - jdk: openjdk6 - env: JRUBY_OPTS="-Xcext.enabled=true" - - rvm: rbx-2.1 - jdk: openjdk7 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: rbx-2.2 jdk: openjdk6 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: rbx-2.2 jdk: openjdk7 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: ruby-head jdk: openjdk6 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: ruby-head jdk: openjdk7 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: ree jdk: openjdk6 - env: JRUBY_OPTS="-Xcext.enabled=true" - rvm: ree jdk: openjdk7 - env: JRUBY_OPTS="-Xcext.enabled=true" - allow_failures: - - rvm: rbx-2.0 - - rvm: rbx-2.1 - - rvm: jruby-head - rvm: jruby-18mode -env: - - JRUBY_OPTS="-Xcext.enabled=true" + jdk: openjdk6 + - rvm: jruby-head + jdk: openjdk6 |