Skip to content

Commit f451d0b

Browse files
committed
chore(ci): update ci image to new 2023-06-21 tag
This makes a few changes that we'll test out: 1. All the places where 16 was the default JDK version will now be set to 17. 2. All images will be the same and set to 2023-06-21 3. For now, the community build will remain on 8, but I'll attempt to bump that separately after this all works.
1 parent 0d8bdd6 commit f451d0b

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

.github/workflows/ci.yaml

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
test_non_bootstrapped:
4646
runs-on: [self-hosted, Linux]
4747
container:
48-
image: lampepfl/dotty:2021-03-22
48+
image: lampepfl/dotty:2023-06-21
4949
options: --cpu-shares 4096
5050
volumes:
5151
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -63,9 +63,6 @@ jobs:
6363
&& github.repository == 'lampepfl/dotty'
6464
)"
6565
steps:
66-
- name: Set JDK 16 as default
67-
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH
68-
6966
- name: Reset existing repo
7067
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
7168

@@ -94,7 +91,7 @@ jobs:
9491
test:
9592
runs-on: [self-hosted, Linux]
9693
container:
97-
image: lampepfl/dotty:2021-03-22
94+
image: lampepfl/dotty:2023-06-21
9895
options: --cpu-shares 4096
9996
volumes:
10097
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -114,9 +111,6 @@ jobs:
114111
)"
115112

116113
steps:
117-
- name: Set JDK 16 as default
118-
run: echo "/usr/lib/jvm/java-16-openjdk-amd64/bin" >> $GITHUB_PATH
119-
120114
- name: Reset existing repo
121115
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
122116

@@ -217,7 +211,7 @@ jobs:
217211
name: MiMa
218212
runs-on: [self-hosted, Linux]
219213
container:
220-
image: lampepfl/dotty:2021-03-22
214+
image: lampepfl/dotty:2023-06-21
221215
options: --cpu-shares 4096
222216
volumes:
223217
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -258,7 +252,7 @@ jobs:
258252
community_build_a:
259253
runs-on: [self-hosted, Linux]
260254
container:
261-
image: lampepfl/dotty:2021-03-22
255+
image: lampepfl/dotty:2023-06-21
262256
options: --cpu-shares 4096
263257
volumes:
264258
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -279,6 +273,9 @@ jobs:
279273
)"
280274

281275
steps:
276+
- name: Set JDK 8 as default
277+
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
278+
282279
- name: Reset existing repo
283280
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
284281

@@ -307,7 +304,7 @@ jobs:
307304
community_build_b:
308305
runs-on: [self-hosted, Linux]
309306
container:
310-
image: lampepfl/dotty:2021-03-22
307+
image: lampepfl/dotty:2023-06-21
311308
options: --cpu-shares 4096
312309
volumes:
313310
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -328,6 +325,9 @@ jobs:
328325
)"
329326

330327
steps:
328+
- name: Set JDK 8 as default
329+
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
330+
331331
- name: Reset existing repo
332332
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
333333

@@ -356,7 +356,7 @@ jobs:
356356
community_build_c:
357357
runs-on: [self-hosted, Linux]
358358
container:
359-
image: lampepfl/dotty:2020-11-19
359+
image: lampepfl/dotty:2023-06-21
360360
options: --cpu-shares 4096
361361
volumes:
362362
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -377,6 +377,9 @@ jobs:
377377
)"
378378

379379
steps:
380+
- name: Set JDK 8 as default
381+
run: echo "/usr/lib/jvm/java-8-openjdk-amd64/bin" >> $GITHUB_PATH
382+
380383
- name: Reset existing repo
381384
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
382385

@@ -405,7 +408,7 @@ jobs:
405408
test_sbt:
406409
runs-on: [self-hosted, Linux]
407410
container:
408-
image: lampepfl/dotty:2021-03-22
411+
image: lampepfl/dotty:2023-06-21
409412
options: --cpu-shares 4096
410413
volumes:
411414
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -445,7 +448,7 @@ jobs:
445448
test_java8:
446449
runs-on: [self-hosted, Linux]
447450
container:
448-
image: lampepfl/dotty:2021-03-22
451+
image: lampepfl/dotty:2023-06-21
449452
options: --cpu-shares 4096
450453
volumes:
451454
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -499,7 +502,7 @@ jobs:
499502
publish_nightly:
500503
runs-on: [self-hosted, Linux]
501504
container:
502-
image: lampepfl/dotty:2021-03-22
505+
image: lampepfl/dotty:2023-06-21
503506
options: --cpu-shares 4096
504507
volumes:
505508
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -550,7 +553,7 @@ jobs:
550553
nightly_documentation:
551554
runs-on: [self-hosted, Linux]
552555
container:
553-
image: lampepfl/dotty:2021-03-22
556+
image: lampepfl/dotty:2023-06-21
554557
options: --cpu-shares 4096
555558
volumes:
556559
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -601,7 +604,7 @@ jobs:
601604
contents: write # for actions/create-release to create a release
602605
runs-on: [self-hosted, Linux]
603606
container:
604-
image: lampepfl/dotty:2021-03-22
607+
image: lampepfl/dotty:2023-06-21
605608
options: --cpu-shares 4096
606609
volumes:
607610
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
@@ -689,7 +692,7 @@ jobs:
689692
open_issue_on_failure:
690693
runs-on: [self-hosted, Linux]
691694
container:
692-
image: lampepfl/dotty:2021-03-22
695+
image: lampepfl/dotty:2023-06-21
693696
needs: [nightly_documentation, test_windows_full]
694697
# The `failure()` expression is true iff at least one of the dependencies
695698
# of this job (including transitive dependencies) has failed.

0 commit comments

Comments
 (0)