Skip to content

Commit f9bb023

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 597935d + d7c1270 commit f9bb023

File tree

458 files changed

+25042
-19154
lines changed

Some content is hidden

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

458 files changed

+25042
-19154
lines changed

.devcontainer/devcontainer.json

+14-8
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11
{
22
"name": "CHIP Ubuntu Development Environment",
33
"runArgs": [
4-
"--cap-add=SYS_PTRACE",
5-
"--security-opt",
6-
"seccomp=unconfined",
74
"--network=host",
8-
"--privileged",
9-
"-v",
10-
"/dev/bus/usb:/dev/bus/usb:ro",
115
"--device-cgroup-rule=a 189:* rmw",
126
"--add-host=host.docker.internal:host-gateway"
137
],
8+
"privileged": true,
9+
"capAdd": ["SYS_PTRACE"],
10+
"securityOpt": ["seccomp=unconfined"],
1411
"mounts": [
15-
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind"
12+
{
13+
"source": "/var/run/docker.sock",
14+
"target": "/var/run/docker.sock",
15+
"type": "bind"
16+
},
17+
{
18+
"source": "/dev/bus/usb",
19+
"target": "/dev/bus/usb",
20+
"type": "bind"
21+
}
1622
],
17-
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 74",
23+
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 97",
1824
"image": "matter-dev-environment:local",
1925
"remoteUser": "vscode",
2026
"containerEnv": {

.github/workflows/bloat_check.yaml

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

3636
container:
37-
image: ghcr.io/project-chip/chip-build:97
37+
image: ghcr.io/project-chip/chip-build:98
3838

3939
steps:
4040
- name: Checkout

.github/workflows/build.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
if: github.actor != 'restyled-io[bot]'
4747

4848
container:
49-
image: ghcr.io/project-chip/chip-build:97
49+
image: ghcr.io/project-chip/chip-build:98
5050
volumes:
5151
- "/:/runner-root-volume"
5252
- "/tmp/log_output:/tmp/test_logs"
@@ -155,7 +155,7 @@ jobs:
155155
if: github.actor != 'restyled-io[bot]'
156156

157157
container:
158-
image: ghcr.io/project-chip/chip-build:97
158+
image: ghcr.io/project-chip/chip-build:98
159159
volumes:
160160
- "/:/runner-root-volume"
161161
- "/tmp/log_output:/tmp/test_logs"
@@ -336,7 +336,7 @@ jobs:
336336
if: github.actor != 'restyled-io[bot]'
337337

338338
container:
339-
image: ghcr.io/project-chip/chip-build:97
339+
image: ghcr.io/project-chip/chip-build:98
340340
volumes:
341341
- "/:/runner-root-volume"
342342
- "/tmp/log_output:/tmp/test_logs"
@@ -408,7 +408,7 @@ jobs:
408408
if: github.actor != 'restyled-io[bot]'
409409

410410
container:
411-
image: ghcr.io/project-chip/chip-build:97
411+
image: ghcr.io/project-chip/chip-build:98
412412
volumes:
413413
- "/:/runner-root-volume"
414414
- "/tmp/log_output:/tmp/test_logs"
@@ -535,7 +535,7 @@ jobs:
535535
if: github.actor != 'restyled-io[bot]'
536536

537537
container:
538-
image: ghcr.io/project-chip/chip-build:97
538+
image: ghcr.io/project-chip/chip-build:98
539539
volumes:
540540
- "/:/runner-root-volume"
541541
- "/tmp/log_output:/tmp/test_logs"

.github/workflows/chef.yaml

+4-4
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:97
39+
image: ghcr.io/project-chip/chip-build:98
4040
options: --user root
4141

4242
steps:
@@ -57,7 +57,7 @@ jobs:
5757
if: github.actor != 'restyled-io[bot]'
5858

5959
container:
60-
image: ghcr.io/project-chip/chip-build-esp32:97
60+
image: ghcr.io/project-chip/chip-build-esp32:98
6161
options: --user root
6262

6363
steps:
@@ -78,7 +78,7 @@ jobs:
7878
if: github.actor != 'restyled-io[bot]'
7979

8080
container:
81-
image: ghcr.io/project-chip/chip-build-nrf-platform:97
81+
image: ghcr.io/project-chip/chip-build-nrf-platform:98
8282
options: --user root
8383

8484
steps:
@@ -99,7 +99,7 @@ jobs:
9999
if: github.actor != 'restyled-io[bot]'
100100

101101
container:
102-
image: ghcr.io/project-chip/chip-build-telink:97
102+
image: ghcr.io/project-chip/chip-build-telink:98
103103
options: --user root
104104

105105
steps:

.github/workflows/doxygen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484

8585
runs-on: ubuntu-latest
8686
container:
87-
image: ghcr.io/project-chip/chip-build-doxygen:97
87+
image: ghcr.io/project-chip/chip-build-doxygen:98
8888

8989
if: github.actor != 'restyled-io[bot]'
9090

.github/workflows/examples-ameba.yaml

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

4141
container:
42-
image: ghcr.io/project-chip/chip-build-ameba:97
42+
image: ghcr.io/project-chip/chip-build-ameba:98
4343
options: --user root
4444

4545
steps:

.github/workflows/examples-asr.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-asr:97
40+
image: ghcr.io/project-chip/chip-build-asr:98
4141
options: --user root
4242

4343
steps:

.github/workflows/examples-bouffalolab.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-bouffalolab:97
41+
image: ghcr.io/project-chip/chip-build-bouffalolab:98
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

.github/workflows/examples-cc13xx_26xx.yaml

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

4444
container:
45-
image: ghcr.io/project-chip/chip-build-ti:97
45+
image: ghcr.io/project-chip/chip-build-ti:98
4646
volumes:
4747
- "/tmp/bloat_reports:/tmp/bloat_reports"
4848
steps:

.github/workflows/examples-cc32xx.yaml

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

4343
container:
44-
image: ghcr.io/project-chip/chip-build-ti:97
44+
image: ghcr.io/project-chip/chip-build-ti:98
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

.github/workflows/examples-efr32.yaml

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

4343
container:
44-
image: ghcr.io/project-chip/chip-build-efr32:95
44+
image: ghcr.io/project-chip/chip-build-efr32:98
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

.github/workflows/examples-esp32.yaml

+2-2
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-esp32:97
40+
image: ghcr.io/project-chip/chip-build-esp32:98
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

@@ -132,7 +132,7 @@ jobs:
132132
if: github.actor != 'restyled-io[bot]' && github.repository_owner == 'espressif'
133133

134134
container:
135-
image: ghcr.io/project-chip/chip-build-esp32:97
135+
image: ghcr.io/project-chip/chip-build-esp32:98
136136
volumes:
137137
- "/tmp/bloat_reports:/tmp/bloat_reports"
138138

.github/workflows/examples-infineon.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-infineon:97
41+
image: ghcr.io/project-chip/chip-build-infineon:98
4242
env:
4343
# TODO: this should probably be part of the dockerfile itself
4444
CY_TOOLS_PATHS: /opt/Tools/ModusToolbox/tools_3.2

.github/workflows/examples-linux-arm.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-crosscompile:97
40+
image: ghcr.io/project-chip/chip-build-crosscompile:98
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

.github/workflows/examples-linux-imx.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-imx:97
40+
image: ghcr.io/project-chip/chip-build-imx:98
4141

4242
steps:
4343
- name: Checkout

.github/workflows/examples-linux-standalone.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:97
40+
image: ghcr.io/project-chip/chip-build:98
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343

.github/workflows/examples-linux-tv-casting-app.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:97
40+
image: ghcr.io/project-chip/chip-build:98
4141

4242
steps:
4343
- name: Checkout

.github/workflows/examples-mw320.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:97
43+
image: ghcr.io/project-chip/chip-build:98
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

.github/workflows/examples-nrfconnect.yaml

+6-5
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-nrf-platform:97
43+
image: ghcr.io/project-chip/chip-build-nrf-platform:98
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646

@@ -193,10 +193,11 @@ jobs:
193193
nrfconnect nrf7002dk_nrf5340_cpuapp all-clusters-app \
194194
examples/all-clusters-app/nrfconnect/build/nrfconnect/zephyr/zephyr.elf \
195195
/tmp/bloat_reports/
196-
- name: Run unit tests for Zephyr native_posix_64 platform
197-
if: github.event_name == 'push' || steps.changed_paths.outputs.tests == 'true' || steps.changed_paths.outputs.nrfconnect == 'true'
198-
run: |
199-
scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target nrf-native-posix-64-tests build"
196+
# Disable native build until next release
197+
# - name: Run unit tests for Zephyr native_posix_64 platform
198+
# if: github.event_name == 'push' || steps.changed_paths.outputs.tests == 'true' || steps.changed_paths.outputs.nrfconnect == 'true'
199+
# run: |
200+
# scripts/run_in_build_env.sh "./scripts/build/build_examples.py --target nrf-native-posix-64-tests build"
200201
- name: Uploading Failed Test Logs
201202
uses: actions/upload-artifact@v4
202203
if: ${{ failure() && !env.ACT }}

.github/workflows/examples-nuttx.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-nuttx:97
41+
image: ghcr.io/project-chip/chip-build-nuttx:98
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
steps:

.github/workflows/examples-nxp.yaml

+2-2
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-nxp:96
43+
image: ghcr.io/project-chip/chip-build-nxp:98
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:
@@ -239,7 +239,7 @@ jobs:
239239
if: github.actor != 'restyled-io[bot]'
240240

241241
container:
242-
image: ghcr.io/project-chip/chip-build-nxp-zephyr:97
242+
image: ghcr.io/project-chip/chip-build-nxp-zephyr:98
243243

244244
steps:
245245
- name: Checkout

.github/workflows/examples-openiotsdk.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-openiotsdk:97
39+
image: ghcr.io/project-chip/chip-build-openiotsdk:98
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242
options: --privileged

.github/workflows/examples-qpg.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:97
43+
image: ghcr.io/project-chip/chip-build:98
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

.github/workflows/examples-stm32.yaml

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

4343
container:
44-
image: ghcr.io/project-chip/chip-build:97
44+
image: ghcr.io/project-chip/chip-build:98
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

.github/workflows/examples-telink.yaml

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

4141
container:
42-
image: ghcr.io/project-chip/chip-build-telink:97
42+
image: ghcr.io/project-chip/chip-build-telink:98
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545

.github/workflows/examples-tizen.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-tizen:97
40+
image: ghcr.io/project-chip/chip-build-tizen:98
4141
options: --user root
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"

.github/workflows/full-android.yaml

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

4141
container:
42-
image: ghcr.io/project-chip/chip-build-android:97
42+
image: ghcr.io/project-chip/chip-build-android:98
4343
volumes:
4444
- "/tmp/log_output:/tmp/test_logs"
4545

.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:97
36+
image: ghcr.io/project-chip/chip-build:98
3737
volumes:
3838
- "/tmp/log_output:/tmp/test_logs"
3939

.github/workflows/java-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
runs-on: ubuntu-latest
4444

4545
container:
46-
image: ghcr.io/project-chip/chip-build-java:97
46+
image: ghcr.io/project-chip/chip-build-java:98
4747
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
4848
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
4949

.github/workflows/lint.yml

+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:97
39+
image: ghcr.io/project-chip/chip-build:98
4040

4141
steps:
4242
- name: Checkout

0 commit comments

Comments
 (0)