summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-03-27 18:23:00 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2015-03-27 18:23:00 -0700
commita58ff98c64cd3e4a5e95d8d950e4db55573c0cb1 (patch)
tree7558695e69bd27398c44a0cbe1999a78501fabc0 /.travis.yml
parenta78333f35970947c0d8d9159b0c1785e59e8b26b (diff)
downloadffi-yajl-a58ff98c64cd3e4a5e95d8d950e4db55573c0cb1.tar.gz
add ruby 2.2.0 track latest rbx
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml13
1 files changed, 9 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 1539f54..ba95abd 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.2.0
- 2.1.2
- 2.1.1
- 2.1.0
@@ -18,7 +19,7 @@ rvm:
- 1.8.7
- ruby-head
- ree
- - rbx-2.2.10
+ - rbx
- jruby-19mode
- jruby-18mode
- jruby-head
@@ -34,9 +35,13 @@ matrix:
jdk: oraclejdk7
- rvm: jruby-head
jdk: openjdk7
- - rvm: rbx-2.2.10
+ - rvm: rbx
jdk: oraclejdk7
exclude:
+ - rvm: 2.2.0
+ jdk: openjdk6
+ - rvm: 2.2.0
+ jdk: openjdk7
- rvm: 2.1.2
jdk: openjdk6
- rvm: 2.1.2
@@ -65,9 +70,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