Skip to content

Commit bd2944c

Browse files
authored
Use latest docker version everywhere (project-chip#29794)
* Use latest docker version everywhere * Revert java tests since java will only be available in docker image 21 * Fix type checks according to linter * Fix type checks according to linter * Fix type checks according to linter * Undo some odd awk changes due to script automation * Undo some odd awk changes due to script automation * Undo version setting in dockerfile as that seems wrong * One more isinstance change to make linter happy
1 parent 702976c commit bd2944c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+73
-73
lines changed

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"mounts": [
1515
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
1616
],
17-
"initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 1",
17+
"initializeCommand": ".devcontainer/build.sh --tag matter-dev-environment:local --version 20",
1818
"image": "matter-dev-environment:local",
1919
"remoteUser": "vscode",
2020
"customizations": {

.github/workflows/bloat_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ubuntu-latest
3434

3535
container:
36-
image: ghcr.io/project-chip/chip-build:1
36+
image: ghcr.io/project-chip/chip-build:20
3737

3838
steps:
3939
- name: Checkout

.github/workflows/build.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build:1
43+
image: ghcr.io/project-chip/chip-build:20
4444
volumes:
4545
- "/tmp/log_output:/tmp/test_logs"
4646
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -131,7 +131,7 @@ jobs:
131131
if: github.actor != 'restyled-io[bot]'
132132

133133
container:
134-
image: ghcr.io/project-chip/chip-build:1
134+
image: ghcr.io/project-chip/chip-build:20
135135
volumes:
136136
- "/tmp/log_output:/tmp/test_logs"
137137
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -279,7 +279,7 @@ jobs:
279279
if: github.actor != 'restyled-io[bot]'
280280

281281
container:
282-
image: ghcr.io/project-chip/chip-build:1
282+
image: ghcr.io/project-chip/chip-build:20
283283
volumes:
284284
- "/tmp/log_output:/tmp/test_logs"
285285
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
@@ -414,7 +414,7 @@ jobs:
414414
if: github.actor != 'restyled-io[bot]'
415415

416416
container:
417-
image: ghcr.io/project-chip/chip-build:1
417+
image: ghcr.io/project-chip/chip-build:20
418418
volumes:
419419
- "/tmp/log_output:/tmp/test_logs"
420420
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0

.github/workflows/chef.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
if: github.actor != 'restyled-io[bot]'
3434

3535
container:
36-
image: ghcr.io/project-chip/chip-build:1
36+
image: ghcr.io/project-chip/chip-build:20
3737
options: --user root
3838

3939
steps:
@@ -54,7 +54,7 @@ jobs:
5454
if: github.actor != 'restyled-io[bot]'
5555

5656
container:
57-
image: ghcr.io/project-chip/chip-build-esp32:2
57+
image: ghcr.io/project-chip/chip-build-esp32:20
5858
options: --user root
5959

6060
steps:
@@ -75,7 +75,7 @@ jobs:
7575
if: github.actor != 'restyled-io[bot]'
7676

7777
container:
78-
image: ghcr.io/project-chip/chip-build-nrf-platform:1
78+
image: ghcr.io/project-chip/chip-build-nrf-platform:20
7979
options: --user root
8080

8181
steps:
@@ -96,7 +96,7 @@ jobs:
9696
if: github.actor != 'restyled-io[bot]'
9797

9898
container:
99-
image: ghcr.io/project-chip/chip-build-telink:16
99+
image: ghcr.io/project-chip/chip-build-telink:20
100100
options: --user root
101101

102102
steps:

.github/workflows/cirque.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
# need to run with privilege, which isn't supported by job.XXX.contaner
4141
# https://github.com/actions/container-action/issues/2
4242
# container:
43-
# image: ghcr.io/project-chip/chip-build-cirque:0.8
43+
# image: ghcr.io/project-chip/chip-build-cirque:20
4444
# volumes:
4545
# - "/tmp:/tmp"
4646
# - "/dev/pts:/dev/pts"

.github/workflows/doxygen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181

8282
runs-on: ubuntu-latest
8383
container:
84-
image: ghcr.io/project-chip/chip-build-doxygen:1
84+
image: ghcr.io/project-chip/chip-build-doxygen:20
8585

8686
if: github.actor != 'restyled-io[bot]'
8787

.github/workflows/examples-ameba.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-ameba:9
39+
image: ghcr.io/project-chip/chip-build-ameba:20
4040
options: --user root
4141

4242
steps:

.github/workflows/examples-asr.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: github.actor != 'restyled-io[bot]'
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build-asr:1
37+
image: ghcr.io/project-chip/chip-build-asr:20
3838
options: --user root
3939

4040
steps:

.github/workflows/examples-bouffalolab.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: github.actor != 'restyled-io[bot]'
3636

3737
container:
38-
image: ghcr.io/project-chip/chip-build-bouffalolab:1
38+
image: ghcr.io/project-chip/chip-build-bouffalolab:20
3939
volumes:
4040
- "/tmp/bloat_reports:/tmp/bloat_reports"
4141
steps:

.github/workflows/examples-cc13x2x7_26x2x7.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-ti:1
39+
image: ghcr.io/project-chip/chip-build-ti:20
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242
steps:

.github/workflows/examples-cc32xx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-ti:1
40+
image: ghcr.io/project-chip/chip-build-ti:20
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

.github/workflows/examples-efr32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-efr32:19
41+
image: ghcr.io/project-chip/chip-build-efr32:20
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

.github/workflows/examples-esp32.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: github.actor != 'restyled-io[bot]'
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build-esp32:2
37+
image: ghcr.io/project-chip/chip-build-esp32:20
3838
volumes:
3939
- "/tmp/bloat_reports:/tmp/bloat_reports"
4040

@@ -130,7 +130,7 @@ jobs:
130130
if: github.actor != 'restyled-io[bot]'
131131

132132
container:
133-
image: ghcr.io/project-chip/chip-build-esp32:2
133+
image: ghcr.io/project-chip/chip-build-esp32:20
134134
volumes:
135135
- "/tmp/bloat_reports:/tmp/bloat_reports"
136136

.github/workflows/examples-infineon.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: github.actor != 'restyled-io[bot]'
3636

3737
container:
38-
image: ghcr.io/project-chip/chip-build-infineon:1
38+
image: ghcr.io/project-chip/chip-build-infineon:20
3939
volumes:
4040
- "/tmp/bloat_reports:/tmp/bloat_reports"
4141
steps:

.github/workflows/examples-k32w.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-k32w:6
40+
image: ghcr.io/project-chip/chip-build-k32w:20
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

.github/workflows/examples-linux-arm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: github.actor != 'restyled-io[bot]'
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build-crosscompile:1
37+
image: ghcr.io/project-chip/chip-build-crosscompile:20
3838
volumes:
3939
- "/tmp/bloat_reports:/tmp/bloat_reports"
4040

.github/workflows/examples-linux-imx.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: github.actor != 'restyled-io[bot]'
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build-imx:1
37+
image: ghcr.io/project-chip/chip-build-imx:20
3838

3939
steps:
4040
- name: Checkout

.github/workflows/examples-linux-standalone.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: github.actor != 'restyled-io[bot]'
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build:1
37+
image: ghcr.io/project-chip/chip-build:20
3838
volumes:
3939
- "/tmp/bloat_reports:/tmp/bloat_reports"
4040

.github/workflows/examples-mbed.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-mbed-os:1
43+
image: ghcr.io/project-chip/chip-build-mbed-os:20
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646

.github/workflows/examples-mw320.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build:1
40+
image: ghcr.io/project-chip/chip-build:20
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

.github/workflows/examples-nrfconnect.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build-nrf-platform:1
40+
image: ghcr.io/project-chip/chip-build-nrf-platform:20
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

.github/workflows/examples-openiotsdk.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-openiotsdk:1
41+
image: ghcr.io/project-chip/chip-build-openiotsdk:20
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
options: --privileged

.github/workflows/examples-qpg.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
if: github.actor != 'restyled-io[bot]'
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build:1
40+
image: ghcr.io/project-chip/chip-build:20
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

.github/workflows/examples-stm32.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build:1
41+
image: ghcr.io/project-chip/chip-build:20
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

.github/workflows/examples-telink.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
if: github.actor != 'restyled-io[bot]'
3737

3838
container:
39-
image: ghcr.io/project-chip/chip-build-telink:16
39+
image: ghcr.io/project-chip/chip-build-telink:20
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

.github/workflows/examples-tizen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
if: github.actor != 'restyled-io[bot]'
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build-tizen:1
37+
image: ghcr.io/project-chip/chip-build-tizen:20
3838
options: --user root
3939
volumes:
4040
- "/tmp/bloat_reports:/tmp/bloat_reports"

.github/workflows/fuzzing-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
if: github.actor != 'restyled-io[bot]'
3434

3535
container:
36-
image: ghcr.io/project-chip/chip-build:1
36+
image: ghcr.io/project-chip/chip-build:20
3737
volumes:
3838
- "/tmp/log_output:/tmp/test_logs"
3939

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
if: github.actor != 'restyled-io[bot]'
3030

3131
container:
32-
image: ghcr.io/project-chip/chip-build:1
32+
image: ghcr.io/project-chip/chip-build:20
3333

3434
steps:
3535
- name: Checkout

.github/workflows/minimal-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ubuntu-latest
3232

3333
container:
34-
image: ghcr.io/project-chip/chip-build-minimal:1
34+
image: ghcr.io/project-chip/chip-build-minimal:20
3535

3636
steps:
3737
- name: Checkout

.github/workflows/qemu.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
if: github.actor != 'restyled-io[bot]'
3939

4040
container:
41-
image: ghcr.io/project-chip/chip-build-esp32-qemu:2
41+
image: ghcr.io/project-chip/chip-build-esp32-qemu:20
4242
volumes:
4343
- "/tmp/log_output:/tmp/test_logs"
4444

@@ -76,7 +76,7 @@ jobs:
7676
if: github.actor != 'restyled-io[bot]'
7777

7878
container:
79-
image: ghcr.io/project-chip/chip-build-tizen-qemu:1
79+
image: ghcr.io/project-chip/chip-build-tizen-qemu:20
8080
volumes:
8181
- "/tmp/log_output:/tmp/test_logs"
8282

.github/workflows/release_artifacts.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333

3434
container:
35-
image: ghcr.io/project-chip/chip-build-esp32:2
35+
image: ghcr.io/project-chip/chip-build-esp32:20
3636

3737
steps:
3838
- name: Checkout
@@ -68,7 +68,7 @@ jobs:
6868
runs-on: ubuntu-latest
6969

7070
container:
71-
image: ghcr.io/project-chip/chip-build-efr32:1
71+
image: ghcr.io/project-chip/chip-build-efr32:20
7272
steps:
7373
- name: Checkout
7474
uses: actions/checkout@v4

.github/workflows/tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
runs-on: ubuntu-latest
4848

4949
container:
50-
image: ghcr.io/project-chip/chip-build:1
50+
image: ghcr.io/project-chip/chip-build:20
5151
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
5252
net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"
5353

@@ -402,7 +402,7 @@ jobs:
402402
runs-on: ubuntu-latest
403403

404404
container:
405-
image: ghcr.io/project-chip/chip-build:1
405+
image: ghcr.io/project-chip/chip-build:20
406406
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
407407
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
408408

.github/workflows/unit_integration_test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
runs-on: ubuntu-latest
3838

3939
container:
40-
image: ghcr.io/project-chip/chip-build:1
40+
image: ghcr.io/project-chip/chip-build:20
4141
volumes:
4242
- "/tmp/log_output:/tmp/test_logs"
4343
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0 net.ipv4.conf.all.forwarding=1 net.ipv6.conf.all.forwarding=1"

.github/workflows/zap_regeneration.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
runs-on: ubuntu-20.04
3232
container:
33-
image: ghcr.io/project-chip/chip-build:1
33+
image: ghcr.io/project-chip/chip-build:20
3434
defaults:
3535
run:
3636
shell: sh

0 commit comments

Comments
 (0)