Skip to content

Commit e44c589

Browse files
committed
Run tests and appraisals against JRuby 10
1 parent c3a0f48 commit e44c589

File tree

3 files changed

+21
-10
lines changed

3 files changed

+21
-10
lines changed

.github/workflows/maven.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,15 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
jruby_version: [ '9.3.15.0', '9.4.12.0' ]
16+
jruby_version: [ '9.3.15.0', '9.4.12.0', '10.0.0.0' ]
1717
java_version: [ '8', '11', '17', '21' ]
18+
exclude:
19+
- jruby_version: '10.0.0.0'
20+
java_version: '8' # JRuby 10 requires Java 21
21+
- jruby_version: '10.0.0.0'
22+
java_version: '11' # JRuby 10 requires Java 21
23+
- jruby_version: '10.0.0.0'
24+
java_version: '17' # JRuby 10 requires Java 21
1825
fail-fast: false
1926

2027
steps:
@@ -42,7 +49,7 @@ jobs:
4249

4350
strategy:
4451
matrix:
45-
jruby_version: [ '9.3.15.0', '9.4.12.0' ]
52+
jruby_version: [ '9.3.15.0', '9.4.12.0', '10.0.0.0' ]
4653
java_version: [ '8', '11', '17', '21' ]
4754
appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72' ]
4855
exclude:
@@ -82,6 +89,12 @@ jobs:
8289
- jruby_version: '9.3.15.0'
8390
java_version: '21'
8491
appraisal: 'rails72' # Requires Ruby 3.1 compatibility, which JRuby 9.3 does not support
92+
- jruby_version: '10.0.0.0'
93+
java_version: '8' # JRuby 10 requires Java 21
94+
- jruby_version: '10.0.0.0'
95+
java_version: '11' # JRuby 10 requires Java 21
96+
- jruby_version: '10.0.0.0'
97+
java_version: '17' # JRuby 10 requires Java 21
8598
fail-fast: false
8699

87100
steps:
@@ -103,5 +116,6 @@ jobs:
103116
- name: Run appraisal for ${{ matrix.appraisal }}
104117
env:
105118
BUNDLE_GEMFILE: gemfiles/${{ matrix.appraisal }}.gemfile
119+
JRUBY_VERSION: ${{ matrix.jruby_version }}
106120
run: bundle install && bundle exec rake spec
107121

Rakefile

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,15 @@ end
3737
directory 'target/classes'
3838

3939
desc "Compile classes"
40-
task(:compile => 'target/classes') { sh 'mvn compile -Dmdep.skip=true' }
40+
task(:compile => 'target/classes') do
41+
sh "mvn compile #{ENV['JRUBY_VERSION'] ? "-Djruby.version=#{ENV['JRUBY_VERSION']}" : ""}"
42+
end
4143

4244
directory 'target/test-classes'
4345

4446
desc "Compile test classes"
45-
task(:test_compile => 'target/test-classes') { sh 'mvn test-compile -Dmdep.skip=true' }
46-
47-
desc "Copy .jar dependencies for (local) testing"
48-
task(:test_jars) { sh 'mvn test-compile' }
49-
5047
task(:test_prepare => ['target/classes', 'target/test-classes']) do
51-
sh 'mvn test-compile'
48+
sh "mvn test-compile #{ENV['JRUBY_VERSION'] ? "-Djruby.version=#{ENV['JRUBY_VERSION']}" : ""}"
5249
end
5350

5451
desc "Unpack the rack gem"

src/spec/ruby/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
target = File.expand_path('target', "#{File.dirname(__FILE__)}/../../..")
55
jars = File.exist?(lib = "#{target}/lib") && ( Dir.entries(lib) - [ '.', '..' ] )
6-
raise "missing .jar dependencies please run `rake test_jars'" if ! jars || jars.empty?
6+
raise "missing .jar dependencies please run `rake test_prepare'" if ! jars || jars.empty?
77
$CLASSPATH << File.expand_path('classes', target)
88
$CLASSPATH << File.expand_path('test-classes', target)
99
jars.each { |jar| $CLASSPATH << File.expand_path(jar, lib) }

0 commit comments

Comments
 (0)