Skip to content

Commit 3744302

Browse files
RUBY-318: Fix Travis config to work for JRuby again
* Drop JRuby 1.7.24, which is MRI 1.9.3-compatible. We no longer support MRI 1.9.3 * Use the newest bundler and hack Gemfile.lock when running with JRuby to make Bundler happy.
1 parent 88f3113 commit 3744302

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

.travis.yml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ bundler_args: --without development docs
44
rvm:
55
- 2.2.4
66
- 2.3.0
7-
- jruby-1.7.24
87
- jruby-9.0.5.0
98
env:
109
global:
@@ -16,12 +15,7 @@ branches:
1615
only:
1716
- master
1817
before_install: |
19-
gem cleanup bundler
20-
2118
if [[ k$TRAVIS_RUBY_VERSION = kjruby* ]] ; then
22-
gem uninstall -i /home/travis/.rvm/gems/jruby-1.7.24@global bundler -x
23-
gem uninstall -i /home/travis/.rvm/gems/jruby-9.0.5.0@global bundler -x
24-
gem install bundler -v 1.7.12
25-
else
26-
gem install bundler -v 1.11.2
27-
fi
19+
# Hack the Gemfile.lock file to indicate we're a JRuby gem, to make bundler happy.
20+
sed -e 's/\(cassandra-driver [^)]*\)/\1-java/' -i"" Gemfile.lock
21+
fi

0 commit comments

Comments
 (0)