Skip to content

Commit 7749d68

Browse files
committed
Merge branch 'im_dm_decoupling' into imdm/2-ember-iterate
2 parents a037965 + d134fab commit 7749d68

File tree

1,075 files changed

+24524
-22293
lines changed

Some content is hidden

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

1,075 files changed

+24524
-22293
lines changed

.github/.wordlist.txt

+7
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,7 @@ DelayedActionTime
369369
delayedApplyActionTimeSec
370370
delayedQueryActionTimeSec
371371
delayQuery
372+
deliverables
372373
demangle
373374
deployable
374375
depottools
@@ -585,6 +586,8 @@ GenericWiFiConfigurationManagerImpl
585586
GetDeviceId
586587
GetDeviceInfo
587588
GetDns
589+
getter
590+
getters
588591
GetInDevelopmentTests
589592
GetIP
590593
getManualTests
@@ -727,6 +730,7 @@ JLink
727730
JLinkExe
728731
JLinkRTTClient
729732
JN
733+
jni
730734
jpg
731735
jre
732736
js
@@ -907,6 +911,7 @@ Multicast
907911
multilib
908912
Multiprotocol
909913
multithreaded
914+
mutex
910915
mutexes
911916
mv
912917
MX
@@ -936,6 +941,7 @@ nfds
936941
NitricOxideConcentrationMeasurement
937942
NitrogenDioxideConcentrationMeasurement
938943
nl
944+
nltest
939945
NLUnitTest
940946
NLUnitTests
941947
nmcli
@@ -1499,6 +1505,7 @@ utils
14991505
UUID
15001506
ux
15011507
validator
1508+
valgrind
15021509
vcom
15031510
VCP
15041511
Vectorcall

.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,7 @@ jobs:
371371
372372
build_darwin:
373373
name: Build on Darwin (clang, python_lib, simulated)
374-
runs-on: macos-latest
374+
runs-on: macos-13
375375
if: github.actor != 'restyled-io[bot]'
376376

377377
steps:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright (c) 2024 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: Check for changes to data_model directory without a sha update
16+
17+
on:
18+
pull_request:
19+
paths:
20+
- "data_model/**"
21+
22+
jobs:
23+
check-submodule-update-label:
24+
name: Check for changes to data_model directory without a sha update
25+
runs-on: ubuntu-latest
26+
if: "git diff --name-only HEAD^..HEAD data_model/ | grep -q spec_sha"
27+
steps:
28+
- name: Error Message
29+
run: echo This pull request attempts to update data_model directory, but is missing updates to spec_sha file with the latest version of the sha. Files in the data_model directory are generated automatically and should not be updated manually.
30+
- name: Fail Job
31+
run: exit 1

.github/workflows/darwin-tests.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Darwin Tests
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123
workflow_dispatch:

.github/workflows/darwin.yaml

+20-32
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,16 @@ name: Darwin
1717
on:
1818
push:
1919
branches-ignore:
20-
- 'dependabot/**'
20+
- "dependabot/**"
2121
pull_request:
2222
merge_group:
2323
workflow_dispatch:
2424

2525
concurrency:
26-
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
26+
group:
27+
${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name ==
28+
'pull_request' && github.event.number) || (github.event_name ==
29+
'workflow_dispatch' && github.run_number) || github.sha }}
2730
cancel-in-progress: true
2831

2932
env:
@@ -51,33 +54,33 @@ jobs:
5154
- name: Checkout submodules & Bootstrap
5255
uses: ./.github/actions/checkout-submodules-and-bootstrap
5356
with:
54-
platform: darwin
55-
bootstrap-log-name: bootstrap-logs-framework-${{ matrix.options.flavor }}
57+
platform: darwin
58+
bootstrap-log-name:
59+
bootstrap-logs-framework-${{ matrix.options.flavor }}
5660
- name: Block zap-cli from being used
5761
env:
58-
PW_ENVSETUP_NO_BANNER: 1
62+
PW_ENVSETUP_NO_BANNER: 1
5963
run: |
60-
# Framework builds are NOT expected to require zap-cli
61-
scripts/run_in_build_env.sh 'rm -- "$(which zap-cli)"'
62-
# run_in_build_env.sh is used to ensure PATH is set to something that would otherwise find zap-cli
63-
scripts/run_in_build_env.sh '(zap-cli --version && exit 1) || exit 0'
64+
# Framework builds are NOT expected to require zap-cli
65+
scripts/run_in_build_env.sh 'rm -- "$(which zap-cli)"'
66+
# run_in_build_env.sh is used to ensure PATH is set to something that would otherwise find zap-cli
67+
scripts/run_in_build_env.sh '(zap-cli --version && exit 1) || exit 0'
6468
- name: Build
6569
working-directory: src/darwin/Framework
6670
run: xcodebuild -target "Matter" ${{ matrix.options.arguments }}
6771

6872
tests:
6973
name: Run framework tests
7074
if: github.actor != 'restyled-io[bot]'
71-
needs: [ framework ] # serialize to avoid running to many parallel macos runners
75+
needs: [framework] # serialize to avoid running to many parallel macos runners
7276
runs-on: macos-13
7377
strategy:
7478
matrix:
7579
options: # We don't need a full matrix
7680
- flavor: asan
77-
arguments: -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES
78-
- flavor: asan-global-storage
79-
arguments: -enableAddressSanitizer YES -enableUndefinedBehaviorSanitizer YES
80-
defines: MTR_PER_CONTROLLER_STORAGE_ENABLED=0
81+
arguments:
82+
-enableAddressSanitizer YES
83+
-enableUndefinedBehaviorSanitizer YES
8184
- flavor: tsan
8285
arguments: -enableThreadSanitizer YES
8386
steps:
@@ -86,8 +89,9 @@ jobs:
8689
- name: Checkout submodules & Bootstrap
8790
uses: ./.github/actions/checkout-submodules-and-bootstrap
8891
with:
89-
platform: darwin
90-
bootstrap-log-name: bootstrap-logs-framework-${{ matrix.options.flavor }}
92+
platform: darwin
93+
bootstrap-log-name:
94+
bootstrap-logs-framework-${{ matrix.options.flavor }}
9195
- name: Build example All Clusters Server
9296
run: |
9397
scripts/examples/gn_build_example.sh examples/all-clusters-app/linux out/debug chip_config_network_layer_ble=false
@@ -127,19 +131,3 @@ jobs:
127131
name: darwin-framework-test-logs-${{ matrix.options.flavor }}
128132
path: /tmp/darwin/framework-tests
129133
retention-days: 5
130-
131-
tv-casting-bridge:
132-
name: Build TV Casting Bridge example
133-
if: github.actor != 'restyled-io[bot]'
134-
needs: [ framework ] # serialize to avoid running to many parallel macos runners
135-
runs-on: macos-13
136-
steps:
137-
- name: Checkout
138-
uses: actions/checkout@v4
139-
- name: Checkout submodules & Bootstrap
140-
uses: ./.github/actions/checkout-submodules-and-bootstrap
141-
with:
142-
platform: darwin
143-
- name: Build
144-
working-directory: examples/tv-casting-app/darwin/MatterTvCastingBridge
145-
run: xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# Copyright (c) 2020-2021 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: TV Casting Example - Darwin
16+
17+
on:
18+
push:
19+
branches-ignore:
20+
- "dependabot/**"
21+
pull_request:
22+
merge_group:
23+
workflow_dispatch:
24+
25+
concurrency:
26+
group:
27+
${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name ==
28+
'pull_request' && github.event.number) || (github.event_name ==
29+
'workflow_dispatch' && github.run_number) || github.sha }}
30+
cancel-in-progress: true
31+
32+
env:
33+
CHIP_NO_LOG_TIMESTAMPS: true
34+
35+
jobs:
36+
tv-casting-bridge:
37+
name: Build TV Casting Bridge example
38+
if: github.actor != 'restyled-io[bot]'
39+
runs-on: macos-13
40+
steps:
41+
- name: Checkout
42+
uses: actions/checkout@v4
43+
- name: Checkout submodules & Bootstrap
44+
uses: ./.github/actions/checkout-submodules-and-bootstrap
45+
with:
46+
platform: darwin
47+
- name: Build
48+
working-directory: examples/tv-casting-app/darwin/MatterTvCastingBridge
49+
run: xcodebuild -target "MatterTvCastingBridge" -sdk iphoneos

.github/workflows/examples-cc13xx_26xx.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Build example - TI CC13XX_26XX
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123

.github/workflows/examples-linux-tv-casting-app.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Test TV Casting Example
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123

.github/workflows/examples-nxp.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Build example - NXP
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123

.github/workflows/examples-rw61x.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ name: Build example - RW61X
1616

1717
on:
1818
push:
19+
branches-ignore:
20+
- 'dependabot/**'
1921
pull_request:
2022
merge_group:
2123

.github/workflows/fuzzing-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868

6969
build_darwin_fuzzing:
7070
name: Build on Darwin
71-
runs-on: macos-latest
71+
runs-on: macos-13
7272
if: github.actor != 'restyled-io[bot]'
7373

7474
steps:

.github/workflows/lint.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ jobs:
9696
--known-failure app/app-platform/ContentAppPlatform.h \
9797
--known-failure controller/ExamplePersistentStorage.cpp \
9898
--known-failure controller/ExamplePersistentStorage.h \
99-
--known-failure app/AttributeAccessInterface.h \
10099
--known-failure app/AttributeAccessToken.h \
101100
--known-failure app/CommandHandler.h \
102101
--known-failure app/CommandHandlerInterface.h \
@@ -107,11 +106,11 @@ jobs:
107106
--known-failure app/reporting/tests/MockReportScheduler.cpp \
108107
--known-failure app/reporting/tests/MockReportScheduler.h \
109108
--known-failure app/util/attribute-storage.cpp \
110-
--known-failure app/util/attribute-storage.h \
111109
--known-failure app/util/attribute-storage-detail.h \
110+
--known-failure app/util/attribute-storage.h \
112111
--known-failure app/util/attribute-table.cpp \
113-
--known-failure app/util/attribute-table.h \
114112
--known-failure app/util/attribute-table-detail.h \
113+
--known-failure app/util/attribute-table.h \
115114
--known-failure app/util/binding-table.cpp \
116115
--known-failure app/util/binding-table.h \
117116
--known-failure app/util/config.h \
@@ -123,6 +122,7 @@ jobs:
123122
--known-failure app/util/generic-callbacks.h \
124123
--known-failure app/util/generic-callback-stubs.cpp \
125124
--known-failure app/util/im-client-callbacks.h \
125+
--known-failure app/util/IMClusterCommandHandler.h \
126126
--known-failure app/util/util.cpp \
127127
--known-failure app/util/util.h \
128128
--known-failure app/WriteHandler.h \

.github/workflows/qemu.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ jobs:
6060
build \
6161
"
6262
- name: Run all tests
63-
# Disabled being tracked here: https://github.com/project-chip/connectedhomeip/issues/32587
64-
if: false
6563
run: |
6664
src/test_driver/esp32/run_qemu_image.py \
6765
--verbose \

.github/workflows/tests.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ jobs:
330330
LSAN_OPTIONS: detect_leaks=1 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
331331

332332
if: github.actor != 'restyled-io[bot]'
333-
runs-on: macos-latest
333+
runs-on: macos-13
334334

335335
steps:
336336
- name: Checkout
@@ -559,6 +559,7 @@ jobs:
559559
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-rvc-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-rvc-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_file json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_RVCOPSTATE_2_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS examples/rvc-app/rvc-common/pics/rvc-app-pics-values --endpoint 1 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
560560
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-rvc-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-rvc-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_file json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_RVCOPSTATE_2_3.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS examples/rvc-app/rvc-common/pics/rvc-app-pics-values --endpoint 1 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
561561
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-rvc-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-rvc-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace_file json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_RVCOPSTATE_2_4.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --PICS examples/rvc-app/rvc-common/pics/rvc-app-pics-values --endpoint 1 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
562+
scripts/run_in_python_env.sh out/venv './src/python_testing/test_testing/test_TC_DA_1_2.py'
562563
- name: Uploading core files
563564
uses: actions/upload-artifact@v4
564565
if: ${{ failure() && !env.ACT }}
@@ -587,7 +588,7 @@ jobs:
587588
TSAN_OPTIONS: "halt_on_error=1"
588589

589590
if: github.actor != 'restyled-io[bot]' && false
590-
runs-on: macos-latest
591+
runs-on: macos-13
591592

592593
steps:
593594
- name: Checkout
+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Copyright (c) 2024 Project CHIP Authors
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
name: Check for Unintentional Submodule Updates
16+
17+
on:
18+
pull_request:
19+
branches-ignore:
20+
- 'dependabot/**'
21+
paths:
22+
- "third_party/**"
23+
- ".gitmodules"
24+
25+
jobs:
26+
check-submodule-update-label:
27+
name: Check For Submodule Update Label
28+
runs-on: ubuntu-latest
29+
if: "!contains(github.event.pull_request.labels.*.name, 'changing-submodules-on-purpose')"
30+
steps:
31+
- name: Error Message
32+
run: echo This pull request attempts to update submodules without the changing-submodules-on-purpose label. Please apply that label if the changes are intentional, or remove those changes.
33+
- name: Fail Job
34+
run: exit 1

BUILD.gn

+1
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
233233
"//scripts/build:build_examples.tests",
234234
"//scripts/py_matter_idl:matter_idl.tests",
235235
"//scripts/py_matter_yamltests:matter_yamltests.tests",
236+
"//scripts/tests/py:metadata_parser.tests",
236237
"//src:tests_run",
237238
]
238239

0 commit comments

Comments
 (0)