Skip to content

Commit 87508ed

Browse files
authored
Add Java 17 to the matrix and align javas (#398)
- Make sure to use temurin - use actions/java in release like in ci
1 parent d29bd9d commit 87508ed

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
os: [ 'ubuntu-latest', 'windows-latest' ]
21-
java: [ '8', '11' ]
21+
java: [ '8', '11', '17' ]
2222
scala: [
2323
{ version: '2.12.15' },
2424
{ version: '2.12.14' },
@@ -36,7 +36,7 @@ jobs:
3636
- name: Set up JVM
3737
uses: actions/setup-java@v2
3838
with:
39-
distribution: 'adopt'
39+
distribution: 'temurin'
4040
java-version: ${{ matrix.java }}
4141

4242
- name: run tests
@@ -54,8 +54,8 @@ jobs:
5454
- name: Set up JVM
5555
uses: actions/setup-java@v2
5656
with:
57-
distribution: 'adopt'
58-
java-version: '8'
57+
distribution: 'temurin'
58+
java-version: '17'
5959

6060
- name: styleCheck
6161
run: sbt styleCheck

.github/workflows/release.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ jobs:
1111
- uses: actions/checkout@v2.3.4
1212
with:
1313
fetch-depth: 0
14-
- uses: olafurpg/setup-scala@v13
14+
- uses: actions/java@v2
15+
with:
16+
distribution: 'temurin'
17+
java-version: 17
1518
- run: sbt ci-release
1619
env:
1720
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}

0 commit comments

Comments
 (0)