Skip to content

Commit 693bea7

Browse files
WojciechMazurWojciechMazur
authored
Backport "Switch to Java 17 in the CI" to LTS (#20921)
Backports #19703 to the LTS branch. PR submitted by the release tooling. [skip ci]
2 parents 94dbe78 + da2dabe commit 693bea7

File tree

1 file changed

+30
-16
lines changed

1 file changed

+30
-16
lines changed

‎.github/workflows/ci.yaml

+30-16
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
test_non_bootstrapped:
4848
runs-on: [self-hosted, Linux]
4949
container:
50-
image: lampepfl/dotty:2021-03-22
50+
image: lampepfl/dotty:2023-11-07
5151
options: --cpu-shares 4096
5252
volumes:
5353
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -65,8 +65,8 @@ jobs:
6565
&& github.repository == 'scala/scala3'
6666
)"
6767
steps:
68-
- name: Set JDK 16 as default
69-
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH
68+
- name: Set JDK 17 as default
69+
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
7070

7171
## Workaround for https://github.com/actions/runner/issues/2033 (See https://github.com/scala/scala3/pull/19720)
7272
- name: Reset existing repo
@@ -99,7 +99,7 @@ jobs:
9999
test:
100100
runs-on: [self-hosted, Linux]
101101
container:
102-
image: lampepfl/dotty:2021-03-22
102+
image: lampepfl/dotty:2023-11-07
103103
options: --cpu-shares 4096
104104
volumes:
105105
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -119,8 +119,8 @@ jobs:
119119
)"
120120

121121
steps:
122-
- name: Set JDK 16 as default
123-
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH
122+
- name: Set JDK 17 as default
123+
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
124124

125125
- name: Reset existing repo
126126
run: |
@@ -229,7 +229,7 @@ jobs:
229229
name: MiMa
230230
runs-on: [self-hosted, Linux]
231231
container:
232-
image: lampepfl/dotty:2021-03-22
232+
image: lampepfl/dotty:2023-11-07
233233
options: --cpu-shares 4096
234234
volumes:
235235
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -248,6 +248,9 @@ jobs:
248248
&& github.repository == 'scala/scala3'
249249
)"
250250
steps:
251+
- name: Set JDK 17 as default
252+
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
253+
251254
- name: Reset existing repo
252255
run: |
253256
git config --global --add safe.directory /__w/scala3/scala3
@@ -272,7 +275,7 @@ jobs:
272275
community_build_a:
273276
runs-on: [self-hosted, Linux]
274277
container:
275-
image: lampepfl/dotty:2021-03-22
278+
image: lampepfl/dotty:2023-11-07
276279
options: --cpu-shares 4096
277280
volumes:
278281
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -293,6 +296,8 @@ jobs:
293296
)"
294297

295298
steps:
299+
- name: Set JDK 8 as default
300+
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
296301
- name: Reset existing repo
297302
run: |
298303
git config --global --add safe.directory /__w/scala3/scala3
@@ -324,7 +329,7 @@ jobs:
324329
community_build_b:
325330
runs-on: [self-hosted, Linux]
326331
container:
327-
image: lampepfl/dotty:2021-03-22
332+
image: lampepfl/dotty:2023-11-07
328333
options: --cpu-shares 4096
329334
volumes:
330335
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -345,6 +350,8 @@ jobs:
345350
)"
346351

347352
steps:
353+
- name: Set JDK 8 as default
354+
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
348355
- name: Reset existing repo
349356
run: |
350357
git config --global --add safe.directory /__w/scala3/scala3
@@ -376,7 +383,7 @@ jobs:
376383
community_build_c:
377384
runs-on: [self-hosted, Linux]
378385
container:
379-
image: lampepfl/dotty:2020-11-19
386+
image: lampepfl/dotty:2023-11-07
380387
options: --cpu-shares 4096
381388
volumes:
382389
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -397,6 +404,8 @@ jobs:
397404
)"
398405

399406
steps:
407+
- name: Set JDK 8 as default
408+
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
400409
- name: Reset existing repo
401410
run: |
402411
git config --global --add safe.directory /__w/scala3/scala3
@@ -428,7 +437,7 @@ jobs:
428437
test_sbt:
429438
runs-on: [self-hosted, Linux]
430439
container:
431-
image: lampepfl/dotty:2021-03-22
440+
image: lampepfl/dotty:2023-11-07
432441
options: --cpu-shares 4096
433442
volumes:
434443
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -447,6 +456,9 @@ jobs:
447456
)"
448457

449458
steps:
459+
- name: Set JDK 17 as default
460+
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
461+
450462
- name: Reset existing repo
451463
run: |
452464
git config --global --add safe.directory /__w/scala3/scala3
@@ -470,7 +482,7 @@ jobs:
470482
test_java8:
471483
runs-on: [self-hosted, Linux]
472484
container:
473-
image: lampepfl/dotty:2021-03-22
485+
image: lampepfl/dotty:2023-11-07
474486
options: --cpu-shares 4096
475487
volumes:
476488
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -526,7 +538,7 @@ jobs:
526538
publish_nightly:
527539
runs-on: [self-hosted, Linux]
528540
container:
529-
image: lampepfl/dotty:2021-03-22
541+
image: lampepfl/dotty:2023-11-07
530542
options: --cpu-shares 4096
531543
volumes:
532544
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -542,6 +554,8 @@ jobs:
542554
SONATYPE_USER: ${{ secrets.SONATYPE_USER_ORGSCALALANG }}
543555

544556
steps:
557+
- name: Set JDK 17 as default
558+
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
545559
- name: Reset existing repo
546560
run: |
547561
git config --global --add safe.directory /__w/scala3/scala3
@@ -579,7 +593,7 @@ jobs:
579593
nightly_documentation:
580594
runs-on: [self-hosted, Linux]
581595
container:
582-
image: lampepfl/dotty:2021-03-22
596+
image: lampepfl/dotty:2023-11-07
583597
options: --cpu-shares 4096
584598
volumes:
585599
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -633,7 +647,7 @@ jobs:
633647
contents: write # for actions/create-release to create a release
634648
runs-on: [self-hosted, Linux]
635649
container:
636-
image: lampepfl/dotty:2021-03-22
650+
image: lampepfl/dotty:2023-11-07
637651
options: --cpu-shares 4096
638652
volumes:
639653
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -723,7 +737,7 @@ jobs:
723737
open_issue_on_failure:
724738
runs-on: [self-hosted, Linux]
725739
container:
726-
image: lampepfl/dotty:2021-03-22
740+
image: lampepfl/dotty:2023-11-07
727741
needs: [nightly_documentation, test_windows_full]
728742
# The `failure()` expression is true iff at least one of the dependencies
729743
# of this job (including transitive dependencies) has failed.

0 commit comments

Comments
 (0)