Skip to content

Commit dc5df02

Browse files
authored
Merge branch 'project-chip:master' into master
2 parents d1de531 + f17d486 commit dc5df02

File tree

4,510 files changed

+393047
-166939
lines changed

Some content is hidden

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

4,510 files changed

+393047
-166939
lines changed

.clang-tidy

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Checks: >
1212
readability-redundant-string-init,
1313
-bugprone-assignment-in-if-condition,
1414
-bugprone-branch-clone,
15+
-bugprone-casting-through-void, #TODO remove this after fixing issues in source code, issue 34008
1516
-bugprone-copy-constructor-init,
1617
-bugprone-easily-swappable-parameters,
1718
-bugprone-forward-declaration-namespace,

.github/.wordlist.txt

+3
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ DevKitM
402402
devtype
403403
df
404404
dfe
405+
DFILE
405406
dfu
406407
DgDxsfHx
407408
dhclient
@@ -649,6 +650,7 @@ href
649650
HSM
650651
hsm
651652
HTTPS
653+
Humidistat
652654
HW
653655
hwadr
654656
HydrogenConcentrationMeasurement
@@ -1354,6 +1356,7 @@ SVR
13541356
SWD
13551357
SWU
13561358
symlinks
1359+
sysbuild
13571360
sysconfdir
13581361
SysConfig
13591362
sysctl

.github/actions/bootstrap-cache/action.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111
attempt_limit: 3
1212
attempt_delay: 2000
1313
with: |
14-
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
14+
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**', '/etc/lsb-release') }}
1515
path: |
1616
.environment
1717
build_overrides/pigweed_environment.gni

.github/actions/bootstrap/action.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ runs:
2626
# because the bootstrapped Pigweed environment contains absolute paths.
2727
echo "Calculating bootstrap cache key for '$PWD'"
2828
FILES_HASH="${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}"
29-
FINAL_HASH="$(echo "$PWD:$FILES_HASH" | shasum -a 256 | cut -d' ' -f1)"
29+
case "$RUNNER_OS" in
30+
macOS) OS_HASH="$(sw_vers | shasum -a 256 | cut -d' ' -f1)";;
31+
*) OS_HASH="$(shasum -a 256 /etc/lsb-release | cut -d' ' -f1)";;
32+
esac
33+
PYTHON_HASH="$(python --version | shasum -a 256 | cut -d' ' -f1)"
34+
FINAL_HASH="$(echo "$PWD:$FILES_HASH:$OS_HASH:$PYTHON_HASH" | shasum -a 256 | cut -d' ' -f1)"
3035
echo key="${RUNNER_OS}-${RUNNER_ARCH}-${{ inputs.platform }}-${FINAL_HASH}" | tee -a "$GITHUB_OUTPUT"
3136
3237
# Split caches across backends

.github/dependabot.yml

-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ updates:
5050
- dependency-name: "third_party/nlassert/repo"
5151
- dependency-name: "third_party/nlfaultinjection/repo"
5252
- dependency-name: "third_party/nlio/repo"
53-
- dependency-name: "third_party/nlunit-test/repo"
5453
- dependency-name: "third_party/nxp/repo"
5554
- dependency-name: "third_party/open-iot-sdk/repo"
5655
- dependency-name: "third_party/ot-br-posix/repo"

.github/labeler.yml

+9
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,15 @@ test driver:
119119
- src/test_driver/*
120120
- src/test_driver/**/*
121121

122+
# Cert tests touched: add current milestone delta-tracking label.
123+
# TODO: Change after Aug 15, 2024
124+
matter-1.4-te2-script-change:
125+
- changed-files:
126+
- any-glob-to-any-file:
127+
- src/python_testing/*
128+
- src/python_testing/**/*
129+
- src/app/tests/suites/certification/*
130+
122131
############################################################
123132
# Source Code
124133
############################################################

.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:50
37+
image: ghcr.io/project-chip/chip-build:66
3838

3939
steps:
4040
- name: Checkout

.github/workflows/build.yaml

+18-13
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ on:
2626
run-codeql:
2727
required: false
2828
type: boolean
29-
29+
3030
concurrency:
3131
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
3232
cancel-in-progress: true
3333

3434
env:
3535
CHIP_NO_LOG_TIMESTAMPS: true
36-
36+
3737
jobs:
3838
build_linux_gcc_debug:
3939
name: Build on Linux (gcc_debug)
@@ -42,7 +42,7 @@ jobs:
4242
if: github.actor != 'restyled-io[bot]'
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build:50
45+
image: ghcr.io/project-chip/chip-build:66
4646
volumes:
4747
- "/:/runner-root-volume"
4848
- "/tmp/log_output:/tmp/test_logs"
@@ -138,7 +138,7 @@ jobs:
138138
if: github.actor != 'restyled-io[bot]'
139139

140140
container:
141-
image: ghcr.io/project-chip/chip-build:50
141+
image: ghcr.io/project-chip/chip-build:65
142142
volumes:
143143
- "/:/runner-root-volume"
144144
- "/tmp/log_output:/tmp/test_logs"
@@ -204,11 +204,13 @@ jobs:
204204
run: |
205205
./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/sanitizers"
206206
- name: Clang-tidy validation
207+
# NOTE: clang-tidy crashes on CodegenDataModel_Write due to Nullable/std::optional check.
208+
# See https://github.com/llvm/llvm-project/issues/97426
207209
run: |
208210
./scripts/run_in_build_env.sh \
209211
"./scripts/run-clang-tidy-on-compile-commands.py \
210212
--compile-database out/sanitizers/compile_commands.json \
211-
--file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/|-ReadImpl|-InvokeSubscribeImpl' \
213+
--file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/|-ReadImpl|-InvokeSubscribeImpl|CodegenDataModel_Write|QuieterReporting' \
212214
check \
213215
"
214216
- name: Clean output
@@ -241,7 +243,7 @@ jobs:
241243
run: |
242244
rm -rf ./zzz_pregenerated
243245
mv scripts/codegen.py.renamed scripts/codegen.py
244-
mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
246+
mv scripts/tools/zap/generate.py.renamed scripts/tools/zap/generate.py
245247
- name: Run fake linux tests with build_examples
246248
run: |
247249
./scripts/run_in_build_env.sh \
@@ -251,7 +253,7 @@ jobs:
251253
uses: ./.github/actions/perform-codeql-analysis
252254
with:
253255
language: cpp
254-
256+
255257
- name: Uploading core files
256258
uses: actions/upload-artifact@v4
257259
if: ${{ failure() && !env.ACT }}
@@ -281,7 +283,7 @@ jobs:
281283
if: github.actor != 'restyled-io[bot]'
282284

283285
container:
284-
image: ghcr.io/project-chip/chip-build:50
286+
image: ghcr.io/project-chip/chip-build:54
285287
volumes:
286288
- "/:/runner-root-volume"
287289
- "/tmp/log_output:/tmp/test_logs"
@@ -332,8 +334,8 @@ jobs:
332334
scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
333335
scripts/run_in_build_env.sh 'virtualenv pyenv'
334336
source pyenv/bin/activate
335-
pip3 install -r src/setup_payload/python/requirements.txt
336-
python3 src/setup_payload/tests/run_python_setup_payload_gen_test.py out/chip-tool
337+
pip3 install -r scripts/setup/requirements.setuppayload.txt
338+
python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
337339
338340
build_linux_python_lighting_device:
339341
name: Build on Linux (python lighting-app)
@@ -342,7 +344,7 @@ jobs:
342344
if: github.actor != 'restyled-io[bot]'
343345

344346
container:
345-
image: ghcr.io/project-chip/chip-build:50
347+
image: ghcr.io/project-chip/chip-build:54
346348
volumes:
347349
- "/:/runner-root-volume"
348350
- "/tmp/log_output:/tmp/test_logs"
@@ -422,10 +424,13 @@ jobs:
422424
run: |
423425
./scripts/run_in_build_env.sh "./scripts/run_codegen_targets.sh out/default"
424426
- name: Clang-tidy validation
427+
# NOTE: clang-tidy crashes on CodegenDataModel_Write due to Nullable/std::optional check.
428+
# See https://github.com/llvm/llvm-project/issues/97426
425429
run: |
426430
./scripts/run_in_build_env.sh \
427431
"./scripts/run-clang-tidy-on-compile-commands.py \
428432
--compile-database out/default/compile_commands.json \
433+
--file-exclude-regex '/(repo|zzz_generated|lwip/standalone)/|CodegenDataModel_Write|QuieterReporting' \
429434
check \
430435
"
431436
- name: Uploading diagnostic logs
@@ -440,7 +445,7 @@ jobs:
440445
uses: ./.github/actions/perform-codeql-analysis
441446
with:
442447
language: cpp
443-
448+
444449
# TODO Log Upload https://github.com/project-chip/connectedhomeip/issues/2227
445450
# TODO https://github.com/project-chip/connectedhomeip/issues/1512
446451

@@ -451,7 +456,7 @@ jobs:
451456
if: github.actor != 'restyled-io[bot]'
452457

453458
container:
454-
image: ghcr.io/project-chip/chip-build:50
459+
image: ghcr.io/project-chip/chip-build:66
455460
volumes:
456461
- "/:/runner-root-volume"
457462
- "/tmp/log_output:/tmp/test_logs"

.github/workflows/chef.yaml

+5-5
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:50
38+
image: ghcr.io/project-chip/chip-build:66
3939
options: --user root
4040

4141
steps:
@@ -56,7 +56,7 @@ jobs:
5656
if: github.actor != 'restyled-io[bot]'
5757

5858
container:
59-
image: ghcr.io/project-chip/chip-build-esp32:50
59+
image: ghcr.io/project-chip/chip-build-esp32:67
6060
options: --user root
6161

6262
steps:
@@ -77,7 +77,7 @@ jobs:
7777
if: github.actor != 'restyled-io[bot]'
7878

7979
container:
80-
image: ghcr.io/project-chip/chip-build-nrf-platform:50
80+
image: ghcr.io/project-chip/chip-build-nrf-platform:66
8181
options: --user root
8282

8383
steps:
@@ -98,7 +98,7 @@ jobs:
9898
if: github.actor != 'restyled-io[bot]'
9999

100100
container:
101-
image: ghcr.io/project-chip/chip-build-telink:50
101+
image: ghcr.io/project-chip/chip-build-telink:66
102102
options: --user root
103103

104104
steps:
@@ -110,7 +110,7 @@ jobs:
110110
platform: telink
111111
# - name: Update Zephyr to specific revision (for developers purpose)
112112
# shell: bash
113-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 68deadeb5c20b82d68700e720d4580e8003bf1d8"
113+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
114114
- name: CI Examples Telink
115115
shell: bash
116116
run: |

.github/workflows/cirque.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
# need to run with privilege, which isn't supported by job.XXX.contaner
4343
# https://github.com/actions/container-action/issues/2
4444
# container:
45-
# image: ghcr.io/project-chip/chip-build-cirque:50
45+
# image: ghcr.io/project-chip/chip-build-cirque:<VERSION_HERE>
4646
# volumes:
4747
# - "/tmp:/tmp"
4848
# - "/dev/pts:/dev/pts"

.github/workflows/darwin-tests.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ jobs:
9595
--target darwin-x64-lit-icd-${BUILD_VARIANT} \
9696
--target darwin-x64-microwave-oven-${BUILD_VARIANT} \
9797
--target darwin-x64-rvc-${BUILD_VARIANT} \
98+
--target darwin-x64-network-manager-${BUILD_VARIANT} \
9899
build \
99100
--copy-artifacts-to objdir-clone \
100101
"
@@ -116,6 +117,7 @@ jobs:
116117
--bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
117118
--microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
118119
--rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
120+
--network-manager-app ./out/darwin-x64-network-manager-${BUILD_VARIANT}/matter-network-manager-app \
119121
"
120122
- name: Run OTA Test
121123
run: |

.github/workflows/darwin.yaml

+4-9
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ jobs:
9797
bootstrap-logs-framework-${{ matrix.options.flavor }}
9898
- name: Build example All Clusters Server
9999
run: |
100-
scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug chip_config_network_layer_ble=false
100+
scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug/all-clusters-app chip_config_network_layer_ble=false
101101
- name: Build example OTA Provider
102102
run: |
103-
scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug chip_config_network_layer_ble=false
103+
scripts/examples/gn_build_example.sh examples/ota-provider-app/linux out/debug/ota-provider-app chip_config_network_layer_ble=false
104104
- name: Build example OTA Requestor
105105
run: |
106106
scripts/examples/gn_build_example.sh examples/ota-requestor-app/linux out/debug/ota-requestor-app chip_config_network_layer_ble=false non_spec_compliant_ota_action_delay_floor=0
@@ -113,13 +113,8 @@ jobs:
113113
run: |
114114
mkdir -p /tmp/darwin/framework-tests
115115
echo "This is a simple log" > /tmp/darwin/framework-tests/end_user_support_log.txt
116-
../../../out/debug/chip-all-clusters-app --interface-id -1 --end_user_support_log /tmp/darwin/framework-tests/end_user_support_log.txt > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
117-
../../../out/debug/chip-all-clusters-app --interface-id -1 --dac_provider ../../../credentials/development/commissioner_dut/struct_cd_origin_pid_vid_correct/test_case_vector.json --product-id 32768 --discriminator 3839 --secured-device-port 5539 --KVS /tmp/chip-all-clusters-app-kvs2 > >(tee /tmp/darwin/framework-tests/all-cluster-app-origin-vid.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-origin-vid-err.log >&2) &
118-
../../../out/debug/chip-all-clusters-app --interface-id -1 --discriminator 101 --passcode 1001 --KVS /tmp/chip-all-clusters-app-kvs101 --secured-device-port 5531 &
119-
../../../out/debug/chip-all-clusters-app --interface-id -1 --discriminator 102 --passcode 1002 --KVS /tmp/chip-all-clusters-app-kvs102 --secured-device-port 5532 &
120-
../../../out/debug/chip-all-clusters-app --interface-id -1 --discriminator 103 --passcode 1003 --KVS /tmp/chip-all-clusters-app-kvs103 --secured-device-port 5533 &
121-
../../../out/debug/chip-all-clusters-app --interface-id -1 --discriminator 104 --passcode 1004 --KVS /tmp/chip-all-clusters-app-kvs104 --secured-device-port 5534 &
122-
../../../out/debug/chip-all-clusters-app --interface-id -1 --discriminator 105 --passcode 1005 --KVS /tmp/chip-all-clusters-app-kvs105 --secured-device-port 5535 &
116+
../../../out/debug/all-clusters-app/chip-all-clusters-app --interface-id -1 --end_user_support_log /tmp/darwin/framework-tests/end_user_support_log.txt > >(tee /tmp/darwin/framework-tests/all-cluster-app.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-err.log >&2) &
117+
../../../out/debug/all-clusters-app/chip-all-clusters-app --interface-id -1 --dac_provider ../../../credentials/development/commissioner_dut/struct_cd_origin_pid_vid_correct/test_case_vector.json --product-id 32768 --discriminator 3839 --secured-device-port 5539 --KVS /tmp/chip-all-clusters-app-kvs2 > >(tee /tmp/darwin/framework-tests/all-cluster-app-origin-vid.log) 2> >(tee /tmp/darwin/framework-tests/all-cluster-app-origin-vid-err.log >&2) &
123118
124119
export TEST_RUNNER_ASAN_OPTIONS=__CURRENT_VALUE__:detect_stack_use_after_return=1
125120

.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:50
84+
image: ghcr.io/project-chip/chip-build-doxygen:66
8585

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

.github/workflows/examples-ameba.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-ameba:50
41+
image: ghcr.io/project-chip/chip-build-ameba:54
4242
options: --user root
4343

4444
steps:

.github/workflows/examples-asr.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-asr:50
39+
image: ghcr.io/project-chip/chip-build-asr:66
4040
options: --user root
4141

4242
steps:

.github/workflows/examples-bouffalolab.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-bouffalolab:50
40+
image: ghcr.io/project-chip/chip-build-bouffalolab:54
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

0 commit comments

Comments
 (0)