Skip to content

Commit d21a4fb

Browse files
lazarkovlazarkov
authored
Merge branch 'master' into feature/refresh-content-app-acl
2 parents 4fe39f8 + 6e31453 commit d21a4fb

File tree

935 files changed

+53010
-11010
lines changed

Some content is hidden

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

935 files changed

+53010
-11010
lines changed

‎.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/workflows/build.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -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' \
212214
check \
213215
"
214216
- name: Clean output
@@ -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' \
429434
check \
430435
"
431436
- name: Uploading diagnostic logs

‎.github/workflows/examples-cc13xx_26xx.yaml

+11-7
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,19 @@ name: Build example - TI CC13XX_26XX
1717
on:
1818
push:
1919
branches-ignore:
20-
- 'dependabot/**'
20+
- "dependabot/**"
2121
pull_request:
2222
merge_group:
2323

2424
concurrency:
25-
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
25+
group:
26+
${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name ==
27+
'pull_request' && github.event.number) || (github.event_name ==
28+
'workflow_dispatch' && github.run_number) || github.sha }}
2629
cancel-in-progress: true
2730
env:
2831
CHIP_NO_LOG_TIMESTAMPS: true
29-
32+
3033
jobs:
3134
cc13xx_26xx:
3235
name: cc13xx_26xx
@@ -47,13 +50,14 @@ jobs:
4750
- name: Checkout submodules & Bootstrap
4851
uses: ./.github/actions/checkout-submodules-and-bootstrap
4952
with:
50-
platform: cc13xx_26xx
53+
platform: cc13xx_26xx
54+
extra-submodule-parameters: " --recursive"
5155
- name: Set up environment for size reports
5256
uses: ./.github/actions/setup-size-reports
5357
if: ${{ !env.ACT }}
5458
with:
55-
gh-context: ${{ toJson(github) }}
56-
59+
gh-context: ${{ toJson(github) }}
60+
5761
- name: Build examples
5862
run: |
5963
scripts/run_in_build_env.sh "\
@@ -103,4 +107,4 @@ jobs:
103107
uses: ./.github/actions/upload-size-reports
104108
if: ${{ !env.ACT }}
105109
with:
106-
platform-name: cc13x4_26x4
110+
platform-name: cc13x4_26x4

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

+2
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ jobs:
6767
--target linux-arm64-light-rpc-ipv6only-clang \
6868
--target linux-arm64-thermostat-no-ble-clang \
6969
--target linux-arm64-lit-icd-no-ble-clang \
70+
--target linux-arm64-fabric-admin-clang-rpc \
71+
--target linux-arm64-fabric-bridge-no-ble-clang-rpc \
7072
build \
7173
"
7274
- name: Bloat report - chip-tool

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -202,21 +202,21 @@ jobs:
202202
run: |
203203
./scripts/run_in_build_env.sh \
204204
"./scripts/build/build_examples.py \
205-
--target linux-x64-fabric-admin \
205+
--target linux-x64-fabric-admin-rpc \
206206
build"
207207
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
208208
linux debug fabric-admin \
209-
out/linux-x64-fabric-admin/fabric-admin \
209+
out/linux-x64-fabric-admin-rpc/fabric-admin \
210210
/tmp/bloat_reports/
211211
- name: Build example Fabric Bridge App
212212
run: |
213213
./scripts/run_in_build_env.sh \
214214
"./scripts/build/build_examples.py \
215-
--target linux-x64-fabric-bridge \
215+
--target linux-x64-fabric-bridge-no-ble-rpc \
216216
build"
217217
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
218218
linux debug fabric-bridge-app \
219-
out/linux-x64-fabric-bridge/fabric-bridge-app \
219+
out/linux-x64-fabric-bridge-no-ble-rpc/fabric-bridge-app \
220220
/tmp/bloat_reports/
221221
- name: Uploading Size Reports
222222
uses: ./.github/actions/upload-size-reports

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

+11-1
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,22 @@ jobs:
6363
./scripts/run_in_build_env.sh \
6464
"scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app chip_casting_simplified=true"
6565
66-
- name: Test casting from Linux tv-casting-app to Linux tv-app
66+
- name:
67+
Test casting from Linux tv-casting-app to Linux tv-app -
68+
Commissionee Generated Passcode
6769
run: |
6870
./scripts/run_in_build_env.sh \
6971
"python3 ./scripts/tests/run_tv_casting_test.py"
7072
timeout-minutes: 2 # Comment this out to debug if GitHub Action times out.
7173

74+
- name:
75+
Test casting from Linux tv-casting-app to Linux tv-app -
76+
Commissioner Generated Passcode
77+
run: |
78+
./scripts/run_in_build_env.sh \
79+
"python3 ./scripts/tests/run_tv_casting_test.py --commissioner-generated-passcode=True"
80+
timeout-minutes: 2 # Comment this out to debug if GitHub Action times out.
81+
7282
- name: Uploading Size Reports
7383
uses: ./.github/actions/upload-size-reports
7484
if: ${{ !env.ACT }}

‎.github/workflows/examples-rw61x.yaml

+8-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ jobs:
4848
- name: Checkout submodules & Bootstrap
4949
uses: ./.github/actions/checkout-submodules-and-bootstrap
5050
with:
51-
platform: rw61x
51+
platform: nxp
52+
extra-submodule-parameters: --recursive
5253

5354
- name: Set up environment for size reports
5455
uses: ./.github/actions/setup-size-reports
@@ -61,6 +62,8 @@ jobs:
6162
scripts/run_in_build_env.sh "\
6263
./scripts/build/build_examples.py \
6364
--target rw61x-all-clusters-app-wifi \
65+
--target rw61x-all-clusters-app-thread \
66+
--target rw61x-all-clusters-app-thread-wifi \
6467
build \
6568
--copy-artifacts-to out/artifacts \
6669
"
@@ -70,6 +73,8 @@ jobs:
7073
scripts/run_in_build_env.sh "\
7174
./scripts/build/build_examples.py \
7275
--target rw61x-thermostat-wifi \
76+
--target rw61x-thermostat-thread \
77+
--target rw61x-thermostat-thread-wifi \
7378
build \
7479
--copy-artifacts-to out/artifacts \
7580
"
@@ -79,6 +84,8 @@ jobs:
7984
scripts/run_in_build_env.sh "\
8085
./scripts/build/build_examples.py \
8186
--target rw61x-laundry-washer-wifi \
87+
--target rw61x-laundry-washer-thread \
88+
--target rw61x-laundry-washer-thread-wifi \
8289
build \
8390
--copy-artifacts-to out/artifacts \
8491
"

‎.github/workflows/lint.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,17 @@ jobs:
288288
type-safe setters
289289
if: always()
290290
run: |
291-
git grep -I -n 'emberAfWriteAttribute' -- './*' ':(exclude).github/workflows/lint.yml' ':(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
291+
git grep -I -n 'emberAfWriteAttribute' -- './*' \
292+
':(exclude).github/workflows/lint.yml' \
293+
':(exclude)examples/common/pigweed/rpc_services/Attributes.h' \
294+
':(exclude)src/app/codegen-data-model/CodegenDataModel_Write.cpp' \
295+
':(exclude)src/app/codegen-data-model/tests/EmberReadWriteOverride.cpp' \
296+
':(exclude)src/app/util/attribute-table.cpp' \
297+
':(exclude)src/app/util/attribute-table.h' \
298+
':(exclude)src/app/util/ember-compatibility-functions.cpp' \
299+
':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt' \
300+
':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' \
301+
&& exit 1 || exit 0
292302
293303
# Run ruff python linter
294304
- name: Check for errors using ruff Python linter

‎.github/workflows/tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@ jobs:
548548
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_TestEventTrigger.py'
549549
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TestBatchInvoke.py'
550550
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TestGroupTableReports.py'
551+
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OPCREDS_3_1.py'
551552
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OPCREDS_3_2.py'
552553
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OPSTATE_2_1.py'
553554
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --load-from-env /tmp/test_env.yaml --script src/python_testing/TC_OPSTATE_2_2.py'
@@ -576,7 +577,6 @@ jobs:
576577
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestMatterTestingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
577578
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --script "src/python_testing/TestSpecParsingSupport.py" --script-args "--trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
578579
scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'
579-
scripts/run_in_python_env.sh out/venv './src/python_testing/test_testing/test_TC_DA_1_2.py'
580580
scripts/run_in_python_env.sh out/venv './src/python_testing/test_testing/test_TC_ICDM_2_1.py'
581581
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestIdChecks.py'
582582

‎.gitmodules

+5-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
path = third_party/nlio/repo
77
url = https://github.com/nestlabs/nlio.git
88
branch = master
9-
[submodule "nlunit-test"]
10-
path = third_party/nlunit-test/repo
11-
url = https://github.com/nestlabs/nlunit-test.git
12-
branch = master
139
[submodule "mbedtls"]
1410
path = third_party/mbedtls/repo
1511
url = https://github.com/ARMmbed/mbedtls.git
@@ -325,3 +321,8 @@
325321
url = https://github.com/Infineon/optiga-trust-m.git
326322
branch = matter_support
327323
platforms = infineon
324+
[submodule "third_party/nxp/nxp_matter_support"]
325+
path = third_party/nxp/nxp_matter_support
326+
url = https://github.com/NXP/nxp_matter_support.git
327+
branch = master
328+
platforms = nxp

‎.pullapprove.yml

+8
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,14 @@ groups:
173173
teams: [reviewers-nordic]
174174
reviews:
175175
request: 10
176+
shared-reviewers-nxp:
177+
type: optional
178+
conditions:
179+
- files.include('*')
180+
reviewers:
181+
teams: [reviewers-nxp]
182+
reviews:
183+
request: 10
176184
shared-reviewers-samsung:
177185
type: optional
178186
conditions:

‎.restyled.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ exclude:
5555
- "third_party/nlassert/repo/**/*" # from here down built with $ awk '/path =/ {print $3 "/**/*"}' .gitmodules
5656
- "third_party/nlfaultinjection/repo/**/*"
5757
- "third_party/nlio/repo/**/*"
58-
- "third_party/nlunit-test/repo/**/*"
5958
- "third_party/mbedtls/repo/**/*"
6059
- "examples/common/QRCode/repo/**/*"
6160
- "examples/common/m5stack-tft/repo/**/*"

‎build_overrides/nxp_sdk.gni

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,9 @@
1414

1515
declare_args() {
1616
# Root directory for NXP SDKs.
17-
nxp_sdk_build_root = "//third_party/nxp"
17+
nxp_sdk_matter_support_root = "//third_party/nxp/nxp_matter_support"
18+
}
19+
20+
declare_args() {
21+
nxp_sdk_build_root = "${nxp_sdk_matter_support_root}/gn_build"
1822
}

‎config/ameba/chip.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ list(
6363
${CHIP_ROOT}/src/app
6464
${CHIP_ROOT}/third_party/nlassert/repo/include
6565
${CHIP_ROOT}/third_party/nlio/repo/include
66-
${CHIP_ROOT}/third_party/nlunit-test/repo/src
6766
)
6867

6968
execute_process(

‎config/esp32/components/chip/CMakeLists.txt

+5-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,11 @@ chip_gn_arg_append("chip_config_network_layer_ble" "false")
118118
endif()
119119

120120
if(CONFIG_DISABLE_IPV4)
121-
chip_gn_arg_append("chip_inet_config_enable_ipv4" "false")
121+
if(NOT CONFIG_LWIP_IPV4)
122+
chip_gn_arg_append("chip_inet_config_enable_ipv4" "false")
123+
else()
124+
message(FATAL_ERROR "Please also disable config option CONFIG_LWIP_IPV4")
125+
endif()
122126
endif()
123127

124128
if(CONFIG_DISABLE_READ_CLIENT)

‎config/zephyr/app/enable-gnu-std.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ add_library(gnu17 INTERFACE)
22
target_compile_options(gnu17
33
INTERFACE
44
$<$<COMPILE_LANGUAGE:CXX>:-std=gnu++17>
5-
-D_SYS__PTHREADTYPES_H_)
6-
target_link_libraries(app PRIVATE gnu17)
5+
-D_DEFAULT_SOURCE)
6+
target_link_libraries(app PRIVATE gnu17)

0 commit comments

Comments
 (0)