summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Frank <flori@ping.de>2015-01-02 23:28:51 +0100
committerFlorian Frank <flori@ping.de>2015-01-02 23:28:51 +0100
commitd3b0480763fb03713a33ba1c03e6d9b9633649c4 (patch)
tree7a6aede463ba0f81d4c4cce8a15e4a7e412ec3d4
parent17fe8e72f484e65e0c36670946934d1f8696e37b (diff)
parentf4f0ab8e0794322edaf923cd5814472f45a9450c (diff)
downloadjson-d3b0480763fb03713a33ba1c03e6d9b9633649c4.tar.gz
Merge pull request #230 from jc00ke/patch-1
CI with current rbx-2
-rw-r--r--.travis.yml6
1 files changed, 2 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 5907de7..3dff534 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,14 +9,12 @@ rvm:
- 2.0.0
- 2.1
- ree
- - rbx-18mode
- - rbx-19mode
+ - rbx-2
- jruby-18mode
- jruby-19mode
- ruby-head
matrix:
allow_failures:
- - rvm: rbx-18mode
- - rvm: rbx-19mode
+ - rvm: rbx-2
- rvm: ruby-head
script: "bundle exec rake"