Skip to content

Commit

Permalink
Update to JRuby 9.2.11.0.
Browse files Browse the repository at this point in the history
Add --no-document to fix hangs when updating RubyGems (and improve test
performance).

Remove deprecated options set by Travis CI from JRUBY_OPTS.

Travis CI sets the --client option (although the documentation says
--server is set).

Using the --client, --server or --noclient options will cause the jruby
command (in 9.2+) to output a warning and break the sub-process tests.
  • Loading branch information
philr committed Mar 15, 2020
1 parent d8556f0 commit 075d5e3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
8 changes: 5 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@ language: ruby
dist: trusty
sudo: false
before_install:
- if [[ $TRAVIS_RUBY_VERSION =~ ^((1|2\.[012]|jruby-(1|9\.0))\.|ree$) ]]; then gem install rubygems-update --version '~> 2.7' --no-document && update_rubygems; else gem update --system; fi
- if [[ $TRAVIS_RUBY_VERSION =~ ^jruby- && ! $TRAVIS_RUBY_VERSION =~ ^jruby-(1|9\.[01]\.) ]]; then export JRUBY_OPTS=`echo "$JRUBY_OPTS" | sed -E -e 's/--((no)?client|server)//g'`; fi
- if [[ $TRAVIS_RUBY_VERSION =~ ^jruby- ]]; then echo "JRUBY_OPTS=$JRUBY_OPTS"; fi
- if [[ $TRAVIS_RUBY_VERSION =~ ^((1|2\.[012]|jruby-(1|9\.0))\.|ree$) ]]; then gem install rubygems-update --version '~> 2.7' --no-document && update_rubygems; else gem update --system --no-document; fi
- gem --version
- if [[ $TRAVIS_RUBY_VERSION =~ ^((1|2\.[012]|jruby-(1|9\.0))\.|ree$) ]]; then gem install bundler --version '~> 1.17'; else gem install bundler; fi
- if [[ $TRAVIS_RUBY_VERSION =~ ^((1|2\.[012]|jruby-(1|9\.0))\.|ree$) ]]; then gem install bundler --version '~> 1.17' --no-document; else gem install bundler --no-document; fi
- bundle --version
before_script:
- bundle update
Expand All @@ -29,7 +31,7 @@ rvm:
- jruby-1.7.27
- jruby-9.0.5.0
- jruby-9.1.17.0
- jruby-9.2.9.0
- jruby-9.2.11.0
- jruby-head
- rbx-2.71828182
- rbx-3.107
Expand Down
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ environment:
JRUBY_VERSION: 9.1.17.0

- RUBY_ENGINE: jruby
JRUBY_VERSION: 9.2.9.0
JRUBY_VERSION: 9.2.11.0

install:
- if not exist vendor mkdir vendor
- if %RUBY_ENGINE%==jruby appveyor DownloadFile https://repo1.maven.org/maven2/org/jruby/jruby-dist/%JRUBY_VERSION%/jruby-dist-%JRUBY_VERSION%-bin.zip -FileName vendor\jruby-dist-%JRUBY_VERSION%-bin.zip
- if %RUBY_ENGINE%==jruby 7z x vendor\jruby-dist-%JRUBY_VERSION%-bin.zip -ovendor -y
- if %RUBY_ENGINE%==jruby set PATH=C:\projects\tzinfo\vendor\jruby-%JRUBY_VERSION%\bin;%PATH%
- if %RUBY_ENGINE%==jruby if defined JRUBY_BUNDLER_VERSION gem install bundler --version "%JRUBY_BUNDLER_VERSION%"
- if %RUBY_ENGINE%==jruby if not defined JRUBY_BUNDLER_VERSION gem install bundler
- if %RUBY_ENGINE%==jruby if defined JRUBY_BUNDLER_VERSION gem install bundler --version "%JRUBY_BUNDLER_VERSION%" --no-document
- if %RUBY_ENGINE%==jruby if not defined JRUBY_BUNDLER_VERSION gem install bundler --no-document
- if v%RUBY_VERSION%==v193 appveyor DownloadFile https://github.com/philr/rubyinstaller/releases/download/1.9.3-p551-openssl-tls-1.1-1.2/ruby-1.9.3-p551-i386-mingw32.7z -FileName vendor\ruby-1.9.3-p551-i386-mingw32.7z
- if v%RUBY_VERSION%==v193 7z e vendor\ruby-1.9.3-p551-i386-mingw32.7z -ovendor ruby-1.9.3-p551-i386-mingw32\bin\libeay32.dll ruby-1.9.3-p551-i386-mingw32\bin\ssleay32.dll ruby-1.9.3-p551-i386-mingw32\lib\ruby\1.9.1\i386-mingw32\openssl.so ruby-1.9.3-p551-i386-mingw32\lib\ruby\1.9.1\rubygems\ssl_certs\ca-bundle.pem
- if v%RUBY_VERSION%==v193 copy /Y vendor\*eay32.dll C:\Ruby193\bin
Expand Down

0 comments on commit 075d5e3

Please sign in to comment.