Skip to content

Commit

Permalink
Fix JRuby build on CI, with a suggestion from Travis CI support (#2040)
Browse files Browse the repository at this point in the history
* Fix JRuby build on CI, with a suggestion from Travis CI support

per
hanami/helpers@13f30e2
per https://twitter.com/jodosha/status/823522145745731586
  • Loading branch information
bf4 authored Jan 26, 2017
1 parent 93ca27f commit 9ccdb15
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down
12 changes: 9 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '{build}'
version: 1.0.{build}-{branch}

skip_tags: true

Expand All @@ -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

Expand Down

0 comments on commit 9ccdb15

Please sign in to comment.