Skip to content

Commit 6786235

Browse files
onsahonsah
committed
chore: update github workflow to use JVM 21
1 parent f99f330 commit 6786235

File tree

2 files changed

+34
-34
lines changed

2 files changed

+34
-34
lines changed

‎.github/workflows/ci.yml

+33-33
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
matrix:
3030
os: [ubuntu-latest]
3131
scala: [2.12, 2.13, 3]
32-
java: [temurin@17]
32+
java: [temurin@21]
3333
project: [rootJS, rootJVM, rootNative]
3434
runs-on: ${{ matrix.os }}
3535
timeout-minutes: 60
@@ -42,17 +42,17 @@ jobs:
4242
- name: Setup sbt
4343
uses: sbt/setup-sbt@v1
4444

45-
- name: Setup Java (temurin@17)
46-
id: setup-java-temurin-17
47-
if: matrix.java == 'temurin@17'
45+
- name: Setup Java (temurin@21)
46+
id: setup-java-temurin-21
47+
if: matrix.java == 'temurin@21'
4848
uses: actions/setup-java@v4
4949
with:
5050
distribution: temurin
51-
java-version: 17
51+
java-version: 21
5252
cache: sbt
5353

5454
- name: sbt update
55-
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
55+
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
5656
run: sbt +update
5757

5858
- name: Install brew formulae (ubuntu)
@@ -63,7 +63,7 @@ jobs:
6363
run: sbt githubWorkflowCheck
6464

6565
- name: Check headers and formatting
66-
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
66+
if: matrix.java == 'temurin@21' && matrix.os == 'ubuntu-latest'
6767
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' headerCheckAll scalafmtCheckAll 'project /' scalafmtSbtCheck
6868

6969
- name: scalaJSLink
@@ -78,11 +78,11 @@ jobs:
7878
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
7979

8080
- name: Check binary compatibility
81-
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
81+
if: matrix.java == 'temurin@21' && matrix.os == 'ubuntu-latest'
8282
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' mimaReportBinaryIssues
8383

8484
- name: Generate API documentation
85-
if: matrix.java == 'temurin@17' && matrix.os == 'ubuntu-latest'
85+
if: matrix.java == 'temurin@21' && matrix.os == 'ubuntu-latest'
8686
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' doc
8787

8888
- name: Scalafix tests
@@ -113,7 +113,7 @@ jobs:
113113
strategy:
114114
matrix:
115115
os: [ubuntu-latest]
116-
java: [temurin@17]
116+
java: [temurin@21]
117117
runs-on: ${{ matrix.os }}
118118
steps:
119119
- name: Checkout current branch (full)
@@ -124,17 +124,17 @@ jobs:
124124
- name: Setup sbt
125125
uses: sbt/setup-sbt@v1
126126

127-
- name: Setup Java (temurin@17)
128-
id: setup-java-temurin-17
129-
if: matrix.java == 'temurin@17'
127+
- name: Setup Java (temurin@21)
128+
id: setup-java-temurin-21
129+
if: matrix.java == 'temurin@21'
130130
uses: actions/setup-java@v4
131131
with:
132132
distribution: temurin
133-
java-version: 17
133+
java-version: 21
134134
cache: sbt
135135

136136
- name: sbt update
137-
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
137+
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
138138
run: sbt +update
139139

140140
- name: Download target directories (2.12, rootJS)
@@ -257,7 +257,7 @@ jobs:
257257
strategy:
258258
matrix:
259259
os: [ubuntu-22.04]
260-
java: [temurin@17]
260+
java: [temurin@21]
261261
runs-on: ${{ matrix.os }}
262262
steps:
263263
- name: Checkout current branch (full)
@@ -268,17 +268,17 @@ jobs:
268268
- name: Setup sbt
269269
uses: sbt/setup-sbt@v1
270270

271-
- name: Setup Java (temurin@17)
272-
id: setup-java-temurin-17
273-
if: matrix.java == 'temurin@17'
271+
- name: Setup Java (temurin@21)
272+
id: setup-java-temurin-21
273+
if: matrix.java == 'temurin@21'
274274
uses: actions/setup-java@v4
275275
with:
276276
distribution: temurin
277-
java-version: 17
277+
java-version: 21
278278
cache: sbt
279279

280280
- name: sbt update
281-
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
281+
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
282282
run: sbt +update
283283

284284
- name: Submit Dependencies
@@ -292,7 +292,7 @@ jobs:
292292
strategy:
293293
matrix:
294294
os: [macos-latest]
295-
java: [temurin@17]
295+
java: [temurin@21]
296296
project: [ioJS, ioJVM, ioNative]
297297
runs-on: ${{ matrix.os }}
298298
steps:
@@ -304,17 +304,17 @@ jobs:
304304
- name: Setup sbt
305305
uses: sbt/setup-sbt@v1
306306

307-
- name: Setup Java (temurin@17)
308-
id: setup-java-temurin-17
309-
if: matrix.java == 'temurin@17'
307+
- name: Setup Java (temurin@21)
308+
id: setup-java-temurin-21
309+
if: matrix.java == 'temurin@21'
310310
uses: actions/setup-java@v4
311311
with:
312312
distribution: temurin
313-
java-version: 17
313+
java-version: 21
314314
cache: sbt
315315

316316
- name: sbt update
317-
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
317+
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
318318
run: sbt +update
319319

320320
- if: matrix.project == 'ioNative'
@@ -327,7 +327,7 @@ jobs:
327327
strategy:
328328
matrix:
329329
os: [ubuntu-22.04]
330-
java: [temurin@17]
330+
java: [temurin@21]
331331
runs-on: ${{ matrix.os }}
332332
steps:
333333
- name: Checkout current branch (full)
@@ -338,17 +338,17 @@ jobs:
338338
- name: Setup sbt
339339
uses: sbt/setup-sbt@v1
340340

341-
- name: Setup Java (temurin@17)
342-
id: setup-java-temurin-17
343-
if: matrix.java == 'temurin@17'
341+
- name: Setup Java (temurin@21)
342+
id: setup-java-temurin-21
343+
if: matrix.java == 'temurin@21'
344344
uses: actions/setup-java@v4
345345
with:
346346
distribution: temurin
347-
java-version: 17
347+
java-version: 21
348348
cache: sbt
349349

350350
- name: sbt update
351-
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
351+
if: matrix.java == 'temurin@21' && steps.setup-java-temurin-21.outputs.cache-hit == 'false'
352352
run: sbt +update
353353

354354
- name: Generate site

‎build.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ThisBuild / crossScalaVersions := Seq("2.12.20", Scala213, "3.3.5")
1515
ThisBuild / tlVersionIntroduced := Map("3" -> "3.0.3")
1616

1717
ThisBuild / githubWorkflowOSes := Seq("ubuntu-latest")
18-
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"))
18+
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("21"))
1919
ThisBuild / githubWorkflowBuildPreamble ++= nativeBrewInstallWorkflowSteps.value
2020
ThisBuild / nativeBrewInstallCond := Some("matrix.project == 'rootNative'")
2121

0 commit comments

Comments
 (0)