diff --git a/.travis.yml b/.travis.yml index 0cd358e4..9aff1edc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,16 @@ rvm: - 2.2.6 - 2.3.3 - ruby-head - - jruby-9.0.4.0 + - jruby-9.1.5.0 # is precompiled per http://rubies.travis-ci.org/ - jruby-head jdk: - oraclejdk8 +before_install: + - gem update --system + - rvm @global do gem uninstall bundler -a -x + - rvm @global do gem install bundler -v 1.13.7 install: bundle install --path=vendor/bundle --retry=3 --jobs=3 cache: directories: @@ -35,13 +39,13 @@ matrix: exclude: - rvm: 2.1 env: RAILS_VERSION=master - - rvm: jruby-9.0.4.0 + - rvm: jruby-9.1.5.0 env: RAILS_VERSION=master - rvm: jruby-head env: RAILS_VERSION=master - rvm: 2.1 env: RAILS_VERSION=5.0 - - rvm: jruby-9.0.4.0 + - rvm: jruby-9.1.5.0 env: RAILS_VERSION=5.0 - rvm: jruby-head env: RAILS_VERSION=5.0 diff --git a/appveyor.yml b/appveyor.yml index 9cd4fd0d..7ecfa13a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: '{build}' +version: 1.0.{build}-{branch} skip_tags: true @@ -7,17 +7,23 @@ environment: matrix: - ruby_version: "Ruby21" - ruby_version: "Ruby21-x64" - - ruby_version: "jruby-9.0.0.0" cache: - vendor/bundle install: - SET PATH=C:\%ruby_version%\bin;%PATH% - - gem install bundler + - gem update --system + - gem uninstall bundler -a -x + - gem install bundler -v 1.13.7 - bundle env - bundle install --path=vendor/bundle --retry=3 --jobs=3 +before_test: + - ruby -v + - gem -v + - bundle -v + test_script: - bundle exec rake ci