Skip to content

Commit d5da150

Browse files
committed
Test against JRuby 10
1 parent a38232c commit d5da150

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

.github/workflows/maven.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,25 @@ name: Java CI
22

33
on:
44
push:
5-
branches-ignore: [ "internal*" ]
5+
branches: [ "master" ]
66
pull_request:
77
branches: [ "master" ]
88

9+
env:
10+
# Default versions for canonical release build
11+
DEFAULT_JAVA_VERSION: '8'
12+
DEFAULT_JRUBY_VERSION: '9.4.12.1'
13+
914
jobs:
1015
build:
1116
name: JRuby ${{ matrix.jruby_version }} / Java ${{ matrix.java_version }}
1217
runs-on: ubuntu-latest
1318

19+
20+
1421
strategy:
1522
matrix:
16-
jruby_version: [ '9.3.15.0', '9.4.12.1' ] # , '10.0.0.1'
23+
jruby_version: [ '9.3.15.0', '9.4.12.1', '10.0.0.1' ]
1724
java_version: [ '8', '11', '17', '21' ]
1825
exclude:
1926
- jruby_version: '10.0.0.1'
@@ -40,7 +47,7 @@ jobs:
4047
# Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
4148
- name: Update dependency graph
4249
uses: advanced-security/maven-dependency-submission-action@aeab9f885293af501bae8bdfe88c589528ea5e25 # v4.1.2
43-
if: github.head_ref == 'refs/heads/master' && matrix.java_version == '8' && startsWith(matrix.jruby_version, '9.4')
50+
if: github.head_ref == 'refs/heads/master' && matrix.java_version == env.DEFAULT_JAVA_VERSION && startsWith(matrix.jruby_version, env.DEFAULT_JRUBY_VERSION)
4451

4552
appraisals:
4653
needs: build
@@ -49,7 +56,7 @@ jobs:
4956

5057
strategy:
5158
matrix:
52-
jruby_version: [ '9.3.15.0', '9.4.12.1' ] # , '10.0.0.1'
59+
jruby_version: [ '9.3.15.0', '9.4.12.1', '10.0.0.1' ]
5360
java_version: [ '8', '11', '17', '21' ]
5461
appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72' ]
5562
exclude:

History.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.3.0
2+
- Adds basic compatibility with JRuby 10.0
3+
- Drop unnecessary jruby.compat.version and RackConfig.getCompatVersion() API
4+
15
## 1.2.3
26

37
- avoid warnings due usage of `File.exists?`

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</description>
2020

2121
<properties>
22-
<jruby.version>9.4.12.0</jruby.version>
22+
<jruby.version>9.4.12.1</jruby.version>
2323
<jruby.maven.plugins.version>3.0.5</jruby.maven.plugins.version>
2424
<gem.home>${project.build.directory}/rubygems</gem.home>
2525
<slf4j.version>2.0.17</slf4j.version>

0 commit comments

Comments
 (0)