Skip to content

Commit 1ba1294

Browse files
Merge branch 'master' into TC-SC-4.3-python-test
2 parents 67b5637 + 9c11019 commit 1ba1294

File tree

969 files changed

+38872
-12378
lines changed

Some content is hidden

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

969 files changed

+38872
-12378
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 22",
17+
"initializeCommand": "bash .devcontainer/build.sh --tag matter-dev-environment:local --version 22",
1818
"image": "matter-dev-environment:local",
1919
"remoteUser": "vscode",
2020
"customizations": {

.github/.wordlist.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -523,6 +523,7 @@ epochStartTime
523523
eq
524524
errorValue
525525
esd
526+
espcoredump
526527
ESPPORT
527528
Espressif
528529
esptool
@@ -1621,4 +1622,4 @@ zephyrproject
16211622
zhengyaohan
16221623
Zigbee
16231624
zigbeealliance
1624-
zigbeethread
1625+
zigbeethread

.github/workflows/cherry-picks.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ jobs:
1414
(github.event.pull_request.merged == true)
1515
&& (
1616
(contains(github.event.pull_request.labels.*.name, 'sve'))
17-
|| (contains(github.event.pull_request.labels.*.name, 'spec'))
1817
|| (contains(github.event.pull_request.labels.*.name, 'request sve'))
1918
|| (contains(github.event.pull_request.labels.*.name, 'cert blocker'))
2019
)
@@ -27,11 +26,12 @@ jobs:
2726
uses: carloscastrojumo/github-cherry-pick-action@v1.0.9
2827
with:
2928
token: ${{ secrets.MATTER_PAT }}
30-
branch: sve-2
29+
branch: 1.3-sve
3130
labels: |
3231
sve cherry pick
3332
reviewers: |
3433
woody-apple
3534
andy31415
35+
raju-apple
3636
env:
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/darwin-tests.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ jobs:
100100
--target darwin-x64-bridge-${BUILD_VARIANT} \
101101
--target darwin-x64-lit-icd-${BUILD_VARIANT} \
102102
--target darwin-x64-microwave-oven-${BUILD_VARIANT} \
103+
--target darwin-x64-rvc-${BUILD_VARIANT} \
103104
build \
104105
--copy-artifacts-to objdir-clone \
105106
"
@@ -120,6 +121,7 @@ jobs:
120121
--tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
121122
--bridge-app ./out/darwin-x64-bridge-${BUILD_VARIANT}/chip-bridge-app \
122123
--microwave-oven-app ./out/darwin-x64-microwave-oven-${BUILD_VARIANT}/chip-microwave-oven-app \
124+
--rvc-app ./out/darwin-x64-rvc-${BUILD_VARIANT}/chip-rvc-app \
123125
"
124126
- name: Run OTA Test
125127
run: |

.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:35
41+
image: ghcr.io/project-chip/chip-build-efr32:36
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444
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:32
40+
image: ghcr.io/project-chip/chip-build-k32w:33
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:
+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# Copyright (c) 2023 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: Build example - TV App and TV Casting App
16+
17+
on:
18+
push:
19+
pull_request:
20+
merge_group:
21+
22+
concurrency:
23+
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
24+
cancel-in-progress: true
25+
26+
env:
27+
CHIP_NO_LOG_TIMESTAMPS: true
28+
29+
jobs:
30+
tv-app:
31+
name: TV App
32+
33+
env:
34+
BUILD_TYPE: tv_app
35+
36+
runs-on: ubuntu-latest
37+
if: github.actor != 'restyled-io[bot]'
38+
39+
container:
40+
image: ghcr.io/project-chip/chip-build-android:35
41+
volumes:
42+
- "/tmp/bloat_reports:/tmp/bloat_reports"
43+
44+
steps:
45+
- name: Checkout
46+
uses: actions/checkout@v4
47+
- name: Checkout submodules & Bootstrap
48+
uses: ./.github/actions/checkout-submodules-and-bootstrap
49+
with:
50+
platform: android
51+
- name: Set up environment for size reports
52+
uses: ./.github/actions/setup-size-reports
53+
if: ${{ !env.ACT }}
54+
with:
55+
gh-context: ${{ toJson(github) }}
56+
- name: Build Android arm64-tv-casting-app
57+
run: |
58+
./scripts/run_in_build_env.sh \
59+
"./scripts/build/build_examples.py --target android-arm64-tv-casting-app build"
60+
- name: Clean out build output
61+
run: rm -rf ./out examples/tv-casting-app/android/App/app/libs/jniLibs/* examples/tv-casting-app/android/App/app/libs/*.jar
62+
- name: Build Android arm64-tv-server
63+
run: |
64+
./scripts/run_in_build_env.sh \
65+
"./scripts/build/build_examples.py --target android-arm64-tv-server build"
66+
- name: Clean out build output
67+
run: rm -rf ./out examples/tv-app/android/App/app/libs/jniLibs/* examples/tv-app/android/App/app/libs/*.jar
68+
- name: Uploading Size Reports
69+
uses: ./.github/actions/upload-size-reports
70+
if: ${{ !env.ACT }}
71+
with:
72+
platform-name: TVApp

.github/workflows/lint.yml

+10-25
Original file line numberDiff line numberDiff line change
@@ -93,36 +93,25 @@ jobs:
9393
--known-failure app/AttributeAccessInterface.h \
9494
--known-failure app/AttributeAccessToken.h \
9595
--known-failure app/att-storage.h \
96-
--known-failure app/BufferedReadCallback.h \
9796
--known-failure app/CommandHandler.h \
9897
--known-failure app/CommandHandlerInterface.h \
99-
--known-failure app/CommandPathParams.h \
100-
--known-failure app/CommandPathRegistry.h \
101-
--known-failure app/CommandResponseSender.h \
10298
--known-failure app/CommandSender.h \
10399
--known-failure app/CommandSenderLegacyCallback.h \
104100
--known-failure app/CompatEnumNames.h \
105-
--known-failure app/ConcreteAttributePath.h \
106-
--known-failure app/ConcreteCommandPath.h \
107101
--known-failure app/data-model/ListLargeSystemExtensions.h \
108102
--known-failure app/EventHeader.h \
109103
--known-failure app/EventLoggingDelegate.h \
110104
--known-failure app/EventLogging.h \
111105
--known-failure app/EventLoggingTypes.h \
112-
--known-failure app/EventManagement.h \
113106
--known-failure app/InteractionModelHelper.h \
114-
--known-failure app/ObjectList.h \
115107
--known-failure app/ReadClient.h \
116108
--known-failure app/ReadHandler.h \
117109
--known-failure app/ReadPrepareParams.h \
118110
--known-failure app/reporting/tests/MockReportScheduler.cpp \
119111
--known-failure app/reporting/tests/MockReportScheduler.h \
120-
--known-failure app/server/AppDelegate.h \
121112
--known-failure app/TestEventTriggerDelegate.h \
122-
--known-failure app/util/af-enums.h \
123113
--known-failure app/util/af.h \
124114
--known-failure app/util/af-types.h \
125-
--known-failure app/util/attribute-metadata.h \
126115
--known-failure app/util/attribute-storage.cpp \
127116
--known-failure app/util/attribute-storage.h \
128117
--known-failure app/util/attribute-storage-null-handling.h \
@@ -142,11 +131,7 @@ jobs:
142131
--known-failure app/util/im-client-callbacks.h \
143132
--known-failure app/util/MatterCallbacks.h \
144133
--known-failure app/util/message.cpp \
145-
--known-failure app/util/mock/Constants.h \
146-
--known-failure app/util/mock/Functions.h \
147-
--known-failure app/util/mock/MockNodeConfig.h \
148134
--known-failure app/util/odd-sized-integers.h \
149-
--known-failure app/util/types_stub.h \
150135
--known-failure app/util/util.cpp \
151136
--known-failure app/util/util.h \
152137
--known-failure app/WriteClient.h \
@@ -197,23 +182,23 @@ jobs:
197182
- name: Check for incorrect error use in VerifyOrExit
198183
if: always()
199184
run: |
200-
git grep -n "VerifyOrExit(.*, [A-Za-z]*_ERROR" -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
185+
git grep -I -n "VerifyOrExit(.*, [A-Za-z]*_ERROR" -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
201186
202187
# git grep exits with 0 if it finds a match, but we want
203188
# to fail (exit nonzero) on match. And we want to exclude this file,
204189
# to avoid our grep regexp matching itself.
205190
- name: Check for use of PRI*8, which are not supported on some libcs.
206191
if: always()
207192
run: |
208-
git grep -n "PRI.8" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)third_party/lwip/repo/lwip/src/include/lwip/arch.h' && exit 1 || exit 0
193+
git grep -I -n "PRI.8" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)third_party/lwip/repo/lwip/src/include/lwip/arch.h' && exit 1 || exit 0
209194
210195
# git grep exits with 0 if it finds a match, but we want
211196
# to fail (exit nonzero) on match. And we want to exclude this file,
212197
# to avoid our grep regexp matching itself.
213198
- name: Check for use of PRI*16, which are not supported on some libcs.
214199
if: always()
215200
run: |
216-
git grep -n "PRI.16" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)third_party/lwip/repo/lwip/src/include/lwip/arch.h' && exit 1 || exit 0
201+
git grep -I -n "PRI.16" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)third_party/lwip/repo/lwip/src/include/lwip/arch.h' && exit 1 || exit 0
217202
218203
# git grep exits with 0 if it finds a match, but we want
219204
# to fail (exit nonzero) on match. And we want to exclude this file,
@@ -226,7 +211,7 @@ jobs:
226211
# TODO: TLVDebug should ideally not be excluded here.
227212
# TODO: protocol_decoder.cpp should ideally not be excluded here.
228213
# TODO: PersistentStorageMacros.h should ideally not be excluded here.
229-
git grep -n "PRI.64" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)examples/chip-tool' ':(exclude)examples/tv-casting-app' ':(exclude)src/app/MessageDef/MessageDefHelper.cpp' ':(exclude)src/app/tests/integration/chip_im_initiator.cpp' ':(exclude)src/lib/core/TLVDebug.cpp' ':(exclude)src/lib/dnssd/tests/TestTxtFields.cpp' ':(exclude)src/lib/format/protocol_decoder.cpp' ':(exclude)src/lib/support/PersistentStorageMacros.h' ':(exclude)src/messaging/tests/echo/echo_requester.cpp' ':(exclude)src/platform/Linux' ':(exclude)src/platform/Ameba' ':(exclude)src/platform/ESP32' ':(exclude)src/platform/webos' ':(exclude)zzz_generated/chip-tool' ':(exclude)src/tools/chip-cert/Cmd_PrintCert.cpp' && exit 1 || exit 0
214+
git grep -I -n "PRI.64" -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)examples/chip-tool' ':(exclude)examples/tv-casting-app' ':(exclude)src/app/MessageDef/MessageDefHelper.cpp' ':(exclude)src/app/tests/integration/chip_im_initiator.cpp' ':(exclude)src/lib/core/TLVDebug.cpp' ':(exclude)src/lib/dnssd/tests/TestTxtFields.cpp' ':(exclude)src/lib/format/protocol_decoder.cpp' ':(exclude)src/lib/support/PersistentStorageMacros.h' ':(exclude)src/messaging/tests/echo/echo_requester.cpp' ':(exclude)src/platform/Linux' ':(exclude)src/platform/Ameba' ':(exclude)src/platform/ESP32' ':(exclude)src/platform/webos' ':(exclude)zzz_generated/chip-tool' ':(exclude)src/tools/chip-cert/Cmd_PrintCert.cpp' && exit 1 || exit 0
230215
231216
# git grep exits with 0 if it finds a match, but we want
232217
# to fail (exit nonzero) on match. And we want to exclude this file,
@@ -261,15 +246,15 @@ jobs:
261246
- name: Check for use of 0x%u and the like, which lead to misleading output.
262247
if: always()
263248
run: |
264-
git grep -n '0x%[0-9l.-]*[^0-9lxX".-]' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
249+
git grep -I -n '0x%[0-9l.-]*[^0-9lxX".-]' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
265250
266251
# git grep exits with 0 if it finds a match, but we want
267252
# to fail (exit nonzero) on match. And we want to exclude this file,
268253
# to avoid our grep regexp matching itself.
269254
- name: Check for use of '"0x" PRIu*' and the like, which lead to misleading output.
270255
if: always()
271256
run: |
272-
git grep -n '0x%[0-9-]*" *PRI[^xX]' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
257+
git grep -I -n '0x%[0-9-]*" *PRI[^xX]' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
273258
274259
# git grep exits with 0 if it finds a match, but we want
275260
# to fail (exit nonzero) on match.
@@ -285,7 +270,7 @@ jobs:
285270
- name: Check for use of 'emberAfReadAttribute' instead of the type-safe getters
286271
if: always()
287272
run: |
288-
git grep -n 'emberAfReadAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)src/app/util/af.h' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' ':(exclude)src/app/util/attribute-table.cpp' && exit 1 || exit 0
273+
git grep -I -n 'emberAfReadAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)src/app/util/af.h' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' ':(exclude)src/app/util/attribute-table.cpp' && exit 1 || exit 0
289274
290275
# git grep exits with 0 if it finds a match, but we want
291276
# to fail (exit nonzero) on match. And we want to exclude this file,
@@ -295,7 +280,7 @@ jobs:
295280
- name: Check for use of 'emberAfWriteAttribute' instead of the type-safe setters
296281
if: always()
297282
run: |
298-
git grep -n 'emberAfWriteAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)src/app/util/af.h' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' ':(exclude)src/app/util/attribute-table.cpp' ':(exclude)examples/common/pigweed/rpc_services/Attributes.h' ':(exclude)src/app/util/attribute-table.h' ':(exclude)src/app/util/ember-compatibility-functions.cpp' && exit 1 || exit 0
283+
git grep -I -n 'emberAfWriteAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(exclude)src/app/util/af.h' ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' ':(exclude)src/app/util/attribute-table.cpp' ':(exclude)examples/common/pigweed/rpc_services/Attributes.h' ':(exclude)src/app/util/attribute-table.h' ':(exclude)src/app/util/ember-compatibility-functions.cpp' && exit 1 || exit 0
299284
300285
# Run python Linter (flake8) and verify python files
301286
# ignore some style errors, restyler should do that
@@ -310,12 +295,12 @@ jobs:
310295
- name: Check for use of "SuccessOrExit(CHIP_ERROR_*)", which should probably be "SuccessOrExit(err = CHIP_ERROR_*)"
311296
if: always()
312297
run: |
313-
git grep -n 'SuccessOrExit(CHIP_ERROR' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
298+
git grep -I -n 'SuccessOrExit(CHIP_ERROR' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
314299
315300
# git grep exits with 0 if it finds a match, but we want
316301
# to fail (exit nonzero) on match. And we want to exclude this file,
317302
# to avoid our grep regexp matching itself.
318303
- name: Check for use of "SuccessOrExit(something-without-assignment(", which should probably be "SuccessOrExit(err = something("
319304
if: always()
320305
run: |
321-
git grep -n 'SuccessOrExit([^=)]*(' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0
306+
git grep -I -n 'SuccessOrExit([^=)]*(' -- './*' ':(exclude).github/workflows/lint.yml' && exit 1 || exit 0

.github/workflows/release_artifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
runs-on: ubuntu-latest
6969

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

0 commit comments

Comments
 (0)