Skip to content

Commit 9ccdb15

Browse files
authored
Fix JRuby build on CI, with a suggestion from Travis CI support (#2040)
* Fix JRuby build on CI, with a suggestion from Travis CI support per hanami/helpers@13f30e2 per https://twitter.com/jodosha/status/823522145745731586
1 parent 93ca27f commit 9ccdb15

File tree

2 files changed

+16
-6
lines changed

2 files changed

+16
-6
lines changed

.travis.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,16 @@ rvm:
77
- 2.2.6
88
- 2.3.3
99
- ruby-head
10-
- jruby-9.0.4.0
10+
- jruby-9.1.5.0 # is precompiled per http://rubies.travis-ci.org/
1111
- jruby-head
1212

1313
jdk:
1414
- oraclejdk8
1515

16+
before_install:
17+
- gem update --system
18+
- rvm @global do gem uninstall bundler -a -x
19+
- rvm @global do gem install bundler -v 1.13.7
1620
install: bundle install --path=vendor/bundle --retry=3 --jobs=3
1721
cache:
1822
directories:
@@ -35,13 +39,13 @@ matrix:
3539
exclude:
3640
- rvm: 2.1
3741
env: RAILS_VERSION=master
38-
- rvm: jruby-9.0.4.0
42+
- rvm: jruby-9.1.5.0
3943
env: RAILS_VERSION=master
4044
- rvm: jruby-head
4145
env: RAILS_VERSION=master
4246
- rvm: 2.1
4347
env: RAILS_VERSION=5.0
44-
- rvm: jruby-9.0.4.0
48+
- rvm: jruby-9.1.5.0
4549
env: RAILS_VERSION=5.0
4650
- rvm: jruby-head
4751
env: RAILS_VERSION=5.0

appveyor.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '{build}'
1+
version: 1.0.{build}-{branch}
22

33
skip_tags: true
44

@@ -7,17 +7,23 @@ environment:
77
matrix:
88
- ruby_version: "Ruby21"
99
- ruby_version: "Ruby21-x64"
10-
- ruby_version: "jruby-9.0.0.0"
1110

1211
cache:
1312
- vendor/bundle
1413

1514
install:
1615
- SET PATH=C:\%ruby_version%\bin;%PATH%
17-
- gem install bundler
16+
- gem update --system
17+
- gem uninstall bundler -a -x
18+
- gem install bundler -v 1.13.7
1819
- bundle env
1920
- bundle install --path=vendor/bundle --retry=3 --jobs=3
2021

22+
before_test:
23+
- ruby -v
24+
- gem -v
25+
- bundle -v
26+
2127
test_script:
2228
- bundle exec rake ci
2329

0 commit comments

Comments
 (0)