Skip to content

Commit 6ac4683

Browse files
committed
chore: add JVM 17 back
1 parent 6786235 commit 6ac4683

File tree

2 files changed

+83
-9
lines changed

2 files changed

+83
-9
lines changed

.github/workflows/ci.yml

+82-8
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,17 @@ jobs:
2929
matrix:
3030
os: [ubuntu-latest]
3131
scala: [2.12, 2.13, 3]
32-
java: [temurin@21]
32+
java: [temurin@17, temurin@21]
3333
project: [rootJS, rootJVM, rootNative]
34+
exclude:
35+
- scala: 2.12
36+
java: temurin@21
37+
- scala: 3
38+
java: temurin@21
39+
- project: rootJS
40+
java: temurin@21
41+
- project: rootNative
42+
java: temurin@21
3443
runs-on: ${{ matrix.os }}
3544
timeout-minutes: 60
3645
steps:
@@ -42,6 +51,19 @@ jobs:
4251
- name: Setup sbt
4352
uses: sbt/setup-sbt@v1
4453

54+
- name: Setup Java (temurin@17)
55+
id: setup-java-temurin-17
56+
if: matrix.java == 'temurin@17'
57+
uses: actions/setup-java@v4
58+
with:
59+
distribution: temurin
60+
java-version: 17
61+
cache: sbt
62+
63+
- name: sbt update
64+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
65+
run: sbt +update
66+
4567
- name: Setup Java (temurin@21)
4668
id: setup-java-temurin-21
4769
if: matrix.java == 'temurin@21'
@@ -63,7 +85,7 @@ jobs:
6385
run: sbt githubWorkflowCheck
6486

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

6991
- name: scalaJSLink
@@ -78,11 +100,11 @@ jobs:
78100
run: sbt 'project ${{ matrix.project }}' '++ ${{ matrix.scala }}' test
79101

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

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

88110
- name: Scalafix tests
@@ -113,7 +135,7 @@ jobs:
113135
strategy:
114136
matrix:
115137
os: [ubuntu-latest]
116-
java: [temurin@21]
138+
java: [temurin@17]
117139
runs-on: ${{ matrix.os }}
118140
steps:
119141
- name: Checkout current branch (full)
@@ -124,6 +146,19 @@ jobs:
124146
- name: Setup sbt
125147
uses: sbt/setup-sbt@v1
126148

149+
- name: Setup Java (temurin@17)
150+
id: setup-java-temurin-17
151+
if: matrix.java == 'temurin@17'
152+
uses: actions/setup-java@v4
153+
with:
154+
distribution: temurin
155+
java-version: 17
156+
cache: sbt
157+
158+
- name: sbt update
159+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
160+
run: sbt +update
161+
127162
- name: Setup Java (temurin@21)
128163
id: setup-java-temurin-21
129164
if: matrix.java == 'temurin@21'
@@ -257,7 +292,7 @@ jobs:
257292
strategy:
258293
matrix:
259294
os: [ubuntu-22.04]
260-
java: [temurin@21]
295+
java: [temurin@17]
261296
runs-on: ${{ matrix.os }}
262297
steps:
263298
- name: Checkout current branch (full)
@@ -268,6 +303,19 @@ jobs:
268303
- name: Setup sbt
269304
uses: sbt/setup-sbt@v1
270305

306+
- name: Setup Java (temurin@17)
307+
id: setup-java-temurin-17
308+
if: matrix.java == 'temurin@17'
309+
uses: actions/setup-java@v4
310+
with:
311+
distribution: temurin
312+
java-version: 17
313+
cache: sbt
314+
315+
- name: sbt update
316+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
317+
run: sbt +update
318+
271319
- name: Setup Java (temurin@21)
272320
id: setup-java-temurin-21
273321
if: matrix.java == 'temurin@21'
@@ -292,7 +340,7 @@ jobs:
292340
strategy:
293341
matrix:
294342
os: [macos-latest]
295-
java: [temurin@21]
343+
java: [temurin@17]
296344
project: [ioJS, ioJVM, ioNative]
297345
runs-on: ${{ matrix.os }}
298346
steps:
@@ -304,6 +352,19 @@ jobs:
304352
- name: Setup sbt
305353
uses: sbt/setup-sbt@v1
306354

355+
- name: Setup Java (temurin@17)
356+
id: setup-java-temurin-17
357+
if: matrix.java == 'temurin@17'
358+
uses: actions/setup-java@v4
359+
with:
360+
distribution: temurin
361+
java-version: 17
362+
cache: sbt
363+
364+
- name: sbt update
365+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
366+
run: sbt +update
367+
307368
- name: Setup Java (temurin@21)
308369
id: setup-java-temurin-21
309370
if: matrix.java == 'temurin@21'
@@ -327,7 +388,7 @@ jobs:
327388
strategy:
328389
matrix:
329390
os: [ubuntu-22.04]
330-
java: [temurin@21]
391+
java: [temurin@17]
331392
runs-on: ${{ matrix.os }}
332393
steps:
333394
- name: Checkout current branch (full)
@@ -338,6 +399,19 @@ jobs:
338399
- name: Setup sbt
339400
uses: sbt/setup-sbt@v1
340401

402+
- name: Setup Java (temurin@17)
403+
id: setup-java-temurin-17
404+
if: matrix.java == 'temurin@17'
405+
uses: actions/setup-java@v4
406+
with:
407+
distribution: temurin
408+
java-version: 17
409+
cache: sbt
410+
411+
- name: sbt update
412+
if: matrix.java == 'temurin@17' && steps.setup-java-temurin-17.outputs.cache-hit == 'false'
413+
run: sbt +update
414+
341415
- name: Setup Java (temurin@21)
342416
id: setup-java-temurin-21
343417
if: matrix.java == 'temurin@21'

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("21"))
18+
ThisBuild / githubWorkflowJavaVersions := Seq(JavaSpec.temurin("17"), JavaSpec.temurin("21"))
1919
ThisBuild / githubWorkflowBuildPreamble ++= nativeBrewInstallWorkflowSteps.value
2020
ThisBuild / nativeBrewInstallCond := Some("matrix.project == 'rootNative'")
2121

0 commit comments

Comments
 (0)