Skip to content

Commit 5b12b41

Browse files
authored
Merge pull request #738 from Philippus/add-java-21-to-build-matrix
Add java 21 to build matrix
2 parents 4cbf588 + 4b25e81 commit 5b12b41

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

.circleci/config.yml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ executors:
1313
docker:
1414
- image: circleci/openjdk:17-buster
1515
resource_class: small
16+
scala_jdk21_executor:
17+
docker:
18+
- image: cimg/openjdk:21.0-node
19+
resource_class: small
1620

1721
commands:
1822
sbt_cmd:
@@ -127,6 +131,18 @@ workflows:
127131
name: jdk17_3.x
128132
java_version: jdk17
129133
scala_version: 3.3.4
134+
- scala_job:
135+
name: jdk21_2.12.x
136+
java_version: jdk21
137+
scala_version: 2.12.20
138+
- scala_job:
139+
name: jdk21_2.13.x
140+
java_version: jdk21
141+
scala_version: 2.13.15
142+
- scala_job:
143+
name: jdk21_3.x
144+
java_version: jdk21
145+
scala_version: 3.3.4
130146
- scalajs_job:
131147
name: sjs1.0_2.12.x
132148
scala_version: 2.12.20

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
java: [8, 11, 17]
12+
java: [8, 11, 17, 21]
1313
scala: [2.12.x, 2.13.x, 3.x]
1414
runs-on: ubuntu-latest
1515
steps:

0 commit comments

Comments
 (0)