diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-04-06 12:21:18 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-04-06 12:21:18 -0700 |
| commit | 10c7da3b6002a59e21c9c8ee202f6f713c3959f9 (patch) | |
| tree | 2b22daaa1be266bbd2e5c0e1057dd71cf9ee5d3d | |
| parent | a78333f35970947c0d8d9159b0c1785e59e8b26b (diff) | |
| parent | a7b4793fc79446951abb0d8aa9b68395c9154c7a (diff) | |
| download | ffi-yajl-10c7da3b6002a59e21c9c8ee202f6f713c3959f9.tar.gz | |
Merge pull request #53 from chef/lcg/tweak-travis
add ruby 2.2.0 track latest rbx
| -rw-r--r-- | .travis.yml | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/.travis.yml b/.travis.yml index 1539f54..cfb4657 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,16 +9,15 @@ 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.2 + - 2.1 - 2.0.0 - 1.9.3 - 1.9.2 - 1.8.7 - ruby-head - ree - - rbx-2.2.10 + - rbx - jruby-19mode - jruby-18mode - jruby-head @@ -34,20 +33,16 @@ matrix: jdk: oraclejdk7 - rvm: jruby-head jdk: openjdk7 - - rvm: rbx-2.2.10 + - rvm: rbx jdk: oraclejdk7 exclude: - - rvm: 2.1.2 + - rvm: 2.2 jdk: openjdk6 - - rvm: 2.1.2 + - rvm: 2.2 jdk: openjdk7 - - rvm: 2.1.1 + - rvm: 2.1 jdk: openjdk6 - - rvm: 2.1.1 - jdk: openjdk7 - - rvm: 2.1.0 - jdk: openjdk6 - - rvm: 2.1.0 + - rvm: 2.1 jdk: openjdk7 - rvm: 2.0.0 jdk: openjdk6 @@ -65,9 +60,9 @@ matrix: jdk: openjdk6 - rvm: 1.8.7 jdk: openjdk7 - - rvm: rbx-2.2.10 + - rvm: rbx jdk: openjdk6 - - rvm: rbx-2.2.10 + - rvm: rbx jdk: openjdk7 - rvm: ruby-head jdk: openjdk6 |