Skip to content

Commit 3de9b9c

Browse files
committed
Use setup-java action for jruby tests
1 parent 00475df commit 3de9b9c

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- macos-latest
4141
- ubuntu-latest
4242
- ubuntu-24.04-arm
43-
- windows-2025
43+
- windows-latest
4444
container:
4545
-
4646
vm:
@@ -54,9 +54,9 @@ jobs:
5454
- truffleruby
5555
- truffleruby+graalvm
5656
exclude:
57-
- os: windows-2025
57+
- os: windows-latest
5858
ruby-version: truffleruby
59-
- os: windows-2025
59+
- os: windows-latest
6060
ruby-version: truffleruby+graalvm
6161
include:
6262
- os: ubuntu-latest
@@ -156,6 +156,13 @@ jobs:
156156
if: endsWith(matrix.container.image, ':alpine') || endsWith(matrix.container.image, '-alpine')
157157
run: apk add build-base
158158

159+
- name: Setup java
160+
if: matrix.ruby-version == 'jruby'
161+
uses: actions/setup-java@v4
162+
with:
163+
distribution: temurin
164+
java-version: 21
165+
159166
- name: Setup ruby
160167
if: matrix.ruby-version
161168
uses: ruby/setup-ruby@v1

.github/workflows/schedule.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,29 @@ jobs:
1616
os:
1717
- macos-latest
1818
- ubuntu-latest
19-
- windows-2025
19+
- windows-latest
2020
ruby-version:
2121
- ruby-head
2222
- jruby-head
2323
- truffleruby-head
2424
- truffleruby+graalvm-head
2525
exclude:
26-
- os: windows-2025
26+
- os: windows-latest
2727
ruby-version: truffleruby-head
28-
- os: windows-2025
28+
- os: windows-latest
2929
ruby-version: truffleruby+graalvm-head
3030

3131
steps:
3232
- name: Checkout
3333
uses: actions/checkout@v4
3434

35+
- name: Setup java
36+
if: matrix.ruby-version == 'jruby-head'
37+
uses: actions/setup-java@v4
38+
with:
39+
distribution: temurin
40+
java-version: 21
41+
3542
- name: Setup ruby
3643
uses: ruby/setup-ruby@v1
3744
with:

0 commit comments

Comments
 (0)