summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2016-07-22 12:52:08 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2016-07-22 12:52:08 -0700
commit67ebb4a582b6e0277c6f39bbf5f43ad240943f9b (patch)
treec0040a72e1f2f2e40ee6d089bd44e25fb7682c36 /.travis.yml
parent6666a0cbee6113482fd53b5ed2af0a26ce9125c1 (diff)
downloadffi-yajl-67ebb4a582b6e0277c6f39bbf5f43ad240943f9b.tar.gz
testing updates
back to green again
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml57
1 files changed, 15 insertions, 42 deletions
diff --git a/.travis.yml b/.travis.yml
index ea59d12..18c29ee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,61 +1,34 @@
sudo: false
before_install:
-# - gem update bundler
+ - gem install bundler
- bundle --version
-# - gem update --system
+ - gem update --system
- gem --version
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.2
- - 2.1
- - 2.0.0
- - 1.9.3
- - ruby-head
- - rbx
- - jruby-19mode
- - jruby-head
-jdk:
- - openjdk7
- - oraclejdk7
- - openjdk6
matrix:
- allow_failures:
+ include:
+ - rvm: 2.3.1
+ - rvm: 2.2.5
- rvm: ruby-head
+ - rvm: rbx
+ - rvm: jruby
jdk: oraclejdk7
+ - rvm: jruby
+ jdk: oraclejdk8
+ - rvm: jruby
+ jdk: openjdk7
- rvm: jruby-head
jdk: oraclejdk7
- rvm: jruby-head
+ jdk: oraclejdk8
+ - rvm: jruby-head
jdk: openjdk7
- exclude:
- - rvm: 2.2
- jdk: openjdk6
- - rvm: 2.2
- jdk: openjdk7
- - rvm: 2.1
- jdk: openjdk6
- - rvm: 2.1
- jdk: openjdk7
- - rvm: 2.0.0
- jdk: openjdk6
- - rvm: 2.0.0
- jdk: openjdk7
- - rvm: 1.9.3
- jdk: openjdk6
- - rvm: 1.9.3
- jdk: openjdk7
- - rvm: rbx
- jdk: openjdk6
- - rvm: rbx
- jdk: openjdk7
- - rvm: ruby-head
- jdk: openjdk6
+ allow_failures:
- rvm: ruby-head
- jdk: openjdk7
- - rvm: jruby-head
- jdk: openjdk6
+
branches:
only:
- master