Skip to content

Commit 0c8c26c

Browse files
committed
Add JDK 17 to CI, replicate #327
1 parent 42eec29 commit 0c8c26c

File tree

3 files changed

+62
-1
lines changed

3 files changed

+62
-1
lines changed

.github/workflows/ci.yml

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
matrix:
3030
os: [ubuntu-latest]
3131
scala: [2.12.16]
32-
java: [temurin@8]
32+
java: [temurin@8, temurin@17]
3333
project: [rootJVM]
3434
runs-on: ${{ matrix.os }}
3535
steps:
@@ -54,6 +54,22 @@ jobs:
5454
java-version: 8
5555
jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
5656

57+
- name: Download Java (temurin@17)
58+
id: download-java-temurin-17
59+
if: matrix.java == 'temurin@17'
60+
uses: typelevel/download-java@v1
61+
with:
62+
distribution: temurin
63+
java-version: 17
64+
65+
- name: Setup Java (temurin@17)
66+
if: matrix.java == 'temurin@17'
67+
uses: actions/setup-java@v2
68+
with:
69+
distribution: jdkfile
70+
java-version: 17
71+
jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
72+
5773
- name: Cache sbt
5874
uses: actions/cache@v2
5975
with:
@@ -135,6 +151,22 @@ jobs:
135151
java-version: 8
136152
jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
137153

154+
- name: Download Java (temurin@17)
155+
id: download-java-temurin-17
156+
if: matrix.java == 'temurin@17'
157+
uses: typelevel/download-java@v1
158+
with:
159+
distribution: temurin
160+
java-version: 17
161+
162+
- name: Setup Java (temurin@17)
163+
if: matrix.java == 'temurin@17'
164+
uses: actions/setup-java@v2
165+
with:
166+
distribution: jdkfile
167+
java-version: 17
168+
jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
169+
138170
- name: Cache sbt
139171
uses: actions/cache@v2
140172
with:
@@ -157,6 +189,16 @@ jobs:
157189
tar xf targets.tar
158190
rm targets.tar
159191
192+
- name: Download target directories (2.12.16, rootJVM)
193+
uses: actions/download-artifact@v2
194+
with:
195+
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12.16-rootJVM
196+
197+
- name: Inflate target directories (2.12.16, rootJVM)
198+
run: |
199+
tar xf targets.tar
200+
rm targets.tar
201+
160202
- name: Import signing key
161203
if: env.PGP_SECRET != '' && env.PGP_PASSPHRASE == ''
162204
run: echo $PGP_SECRET | base64 -di | gpg --import
@@ -201,6 +243,22 @@ jobs:
201243
java-version: 8
202244
jdkFile: ${{ steps.download-java-temurin-8.outputs.jdkFile }}
203245

246+
- name: Download Java (temurin@17)
247+
id: download-java-temurin-17
248+
if: matrix.java == 'temurin@17'
249+
uses: typelevel/download-java@v1
250+
with:
251+
distribution: temurin
252+
java-version: 17
253+
254+
- name: Setup Java (temurin@17)
255+
if: matrix.java == 'temurin@17'
256+
uses: actions/setup-java@v2
257+
with:
258+
distribution: jdkfile
259+
java-version: 17
260+
jdkFile: ${{ steps.download-java-temurin-17.outputs.jdkFile }}
261+
204262
- name: Cache sbt
205263
uses: actions/cache@v2
206264
with:

.mergify.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ pull_request_rules:
1313
- body~=labels:.*early-semver-patch
1414
- body~=labels:.*early-semver-minor
1515
- status-success=Build and Test (ubuntu-latest, 2.12.16, temurin@8, rootJVM)
16+
- status-success=Build and Test (ubuntu-latest, 2.12.16, temurin@17, rootJVM)
1617
- '#approved-reviews-by>=1'
1718
actions:
1819
merge: {}

build.sbt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ ThisBuild / developers := List(
1111
tlGitHubDev("djspiewak", "Daniel Spiewak")
1212
)
1313

14+
ThisBuild / githubWorkflowJavaVersions += JavaSpec.temurin("17")
15+
1416
ThisBuild / mergifyStewardConfig ~= {
1517
_.map(_.copy(mergeMinors = true, author = "typelevel-steward[bot]"))
1618
}

0 commit comments

Comments
 (0)