Skip to content

Commit 317f3ff

Browse files
isomarcteSethTisue
authored andcommitted
Add JDK 15/16 To The CircleCI Build
Though JDK16 is not yet released, building with it now will give us warnings about issues such as failure to build on JDK15 (#450) Also adds the `osgiBundle` task to CI to catch issues with it.
1 parent 85969b6 commit 317f3ff

File tree

1 file changed

+34
-4
lines changed

1 file changed

+34
-4
lines changed

.circleci/config.yml

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,16 @@ executors:
99
- image: circleci/openjdk:11-jdk
1010
scala_jdk13_executor:
1111
docker:
12-
- image: circleci/openjdk:13.0.1-jdk-buster
12+
- image: circleci/openjdk:13-buster
1313
scala_jdk14_executor:
1414
docker:
15-
- image: circleci/openjdk:14-ea-26-jdk-buster
15+
- image: circleci/openjdk:14-buster
16+
scala_jdk15_executor:
17+
docker:
18+
- image: circleci/openjdk:15-buster
19+
scala_jdk16_executor:
20+
docker:
21+
- image: circleci/openjdk:16-buster
1622

1723
commands:
1824
sbt_cmd:
@@ -23,7 +29,7 @@ commands:
2329
default: 2.12.12
2430
sbt_tasks:
2531
type: string
26-
default: update compile test:compile test doc package
32+
default: update compile test:compile test doc package osgiBundle
2733
steps:
2834
- restore_cache:
2935
keys:
@@ -55,7 +61,7 @@ jobs:
5561
- run: java -version
5662
- sbt_cmd:
5763
scala_version: << parameters.scala_version >>
58-
sbt_tasks: xml/update xml/compile xml/test:compile xml/test xml/doc xml/package
64+
sbt_tasks: xml/update xml/compile xml/test:compile xml/test xml/doc xml/package xml/osgiBundle
5965
scalajs_job:
6066
executor: scala_jdk8_executor
6167
parameters:
@@ -128,6 +134,30 @@ workflows:
128134
name: jdk14_dotty
129135
java_version: jdk14
130136
scala_version: 0.27.0-RC1
137+
- scala_job:
138+
name: jdk15_2.12
139+
java_version: jdk15
140+
scala_version: 2.12.12
141+
- scala_job:
142+
name: jdk15_2.13
143+
java_version: jdk15
144+
scala_version: 2.13.3
145+
- scala_job:
146+
name: jdk15_dotty
147+
java_version: jdk15
148+
scala_version: 0.27.0-RC1
149+
- scala_job:
150+
name: jdk16_2.12
151+
java_version: jdk16
152+
scala_version: 2.12.12
153+
- scala_job:
154+
name: jdk16_2.13
155+
java_version: jdk16
156+
scala_version: 2.13.3
157+
- scala_job:
158+
name: jdk16_dotty
159+
java_version: jdk16
160+
scala_version: 0.27.0-RC1
131161
- scalajs_job:
132162
name: sjs1.0_2.12
133163
scala_version: 2.12.12

0 commit comments

Comments
 (0)