Skip to content

Pin JRuby to latest stable #2296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Pin JRuby to latest stable #2296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f9872e
Pin JRuby to latest stable
JonRowe Mar 23, 2020
c63c14a
Say goodbye to a deprecared -client JVM option
pirj Mar 23, 2020
75905d6
TEMP! point to other rspec projects branch that drops --source for JVM
pirj Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dist: trusty
matrix:
include:
# Rails 6 builds
- rvm: jruby-head
- rvm: jruby-9.2.11.0
jdk: oraclejdk11
env:
- RAILS_VERSION='~> 6.0.0'
Expand All @@ -57,7 +57,7 @@ matrix:
env: RAILS_VERSION='~> 6.0.0'

# Rails 5.2 builds >= 2.2.2
- rvm: jruby-head
- rvm: jruby-9.2.11.0
jdk: oraclejdk11
env:
- RAILS_VERSION='~> 5.2.0'
Expand Down
8 changes: 8 additions & 0 deletions Gemfile-rspec-dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
branch = File.read(File.expand_path("../maintenance-branch", __FILE__)).chomp
%w[rspec rspec-core rspec-expectations rspec-mocks rspec-support].each do |lib|
library_path = File.expand_path("../../#{lib}", __FILE__)
if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
gem lib, :path => library_path, :require => false
else
gem lib, :git => "https://github.com/rspec/#{lib}.git", :branch => 'drop-client-java-option', :require => false
end
end
%w[rspec].each do |lib|
library_path = File.expand_path("../../#{lib}", __FILE__)
if File.exist?(library_path) && !ENV['USE_GIT_REPOS']
gem lib, :path => library_path, :require => false
Expand Down
5 changes: 1 addition & 4 deletions script/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,9 @@ function run_specs_and_record_done {

function run_cukes {
if [ -d features ]; then
# force jRuby to use client mode JVM or a compilation mode thats as close as possible,
# idea taken from https://github.com/jruby/jruby/wiki/Improving-startup-time
#
# Note that we delay setting this until we run the cukes because we've seen
# spec failures in our spec suite due to problems with this mode.
export JAVA_OPTS='-client -XX:+TieredCompilation -XX:TieredStopAtLevel=1'
export JAVA_OPTS='-XX:+TieredCompilation -XX:TieredStopAtLevel=1'

echo "${PWD}/bin/cucumber"

Expand Down