diff options
author | Paul Yang <TeBoring@users.noreply.github.com> | 2016-10-10 13:58:39 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-10 13:58:39 -0700 |
commit | fd046f6263fb17383cafdbb25c361e3451c31105 (patch) | |
tree | 5879fa426bd0cf22df5a7ee39d25b8ece7c117f8 /ruby/travis-test.sh | |
parent | 337a028bb65ccca4dda768695950b5aba53ae2c9 (diff) | |
parent | daba6653f1289b58873c2ae993afcdb82035d2fb (diff) | |
download | protobuf-fd046f6263fb17383cafdbb25c361e3451c31105.tar.gz protobuf-fd046f6263fb17383cafdbb25c361e3451c31105.tar.bz2 protobuf-fd046f6263fb17383cafdbb25c361e3451c31105.zip |
Merge pull request #2234 from TeBoring/master
Merge 3.1.x branch into master.
Diffstat (limited to 'ruby/travis-test.sh')
-rwxr-xr-x | ruby/travis-test.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby/travis-test.sh b/ruby/travis-test.sh index 59e970a6..d3022657 100755 --- a/ruby/travis-test.sh +++ b/ruby/travis-test.sh @@ -8,7 +8,7 @@ test_version() { if [ "$version" == "jruby-1.7" ] ; then # No conformance tests yet -- JRuby is too broken to run them. bash --login -c \ - "rvm install $version && rvm use $version && \ + "rvm install $version && rvm use $version && rvm get head && \ which ruby && \ gem install bundler && bundle && \ rake test" |