Skip to content

Commit b56fb79

Browse files
committed
Run tests with JRuby 9.3 as well as 9.4
1 parent 7e15e72 commit b56fb79

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/maven.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@ on:
1616

1717
jobs:
1818
build:
19-
name: Java ${{ matrix.java_version }}
19+
name: JRuby ${{ matrix.jruby_version }} / Java ${{ matrix.java_version }}
2020
runs-on: ubuntu-latest
2121

2222
strategy:
2323
matrix:
2424
java_version: [ '8', '11', '17', '21' ]
25+
jruby_version: [ '9.3.15.0', '9.4.9.0' ]
2526
fail-fast: false
2627

2728
steps:
@@ -33,9 +34,9 @@ jobs:
3334
distribution: 'temurin'
3435
cache: maven
3536
- name: Build with Maven
36-
run: mvn -B install --file pom.xml
37+
run: mvn -B install --file pom.xml -Djruby.version=${{ matrix.jruby_version }}
3738

3839
# Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
3940
- name: Update dependency graph
4041
uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
41-
if: github.head_ref == 'refs/heads/master' && matrix.java_version == '8'
42+
if: github.head_ref == 'refs/heads/master' && matrix.java_version == '8' && startsWith(matrix.jruby_version, '9.4')

src/spec/ruby/rack/application_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -361,10 +361,10 @@ def newRuntime() # use the current runtime instead of creating new
361361
set_config 'jruby.runtime.env', 'false'
362362
set_config 'jruby.runtime.env.rubyopt', 'true'
363363

364-
app_factory = app_factory_with_RUBYOPT '-W:no-deprecated'
364+
app_factory = app_factory_with_RUBYOPT '-U'
365365
@runtime = app_factory.newRuntime
366366
should_eval_as_nil "ENV['HOME']"
367-
should_eval_as_eql_to "ENV['RUBYOPT']", '-W:no-deprecated'
367+
should_eval_as_eql_to "ENV['RUBYOPT']", '-U'
368368
end
369369

370370
it "keeps RUBYOPT by default with empty ENV (backwards compat)" do

0 commit comments

Comments
 (0)