Skip to content

Commit 8735c45

Browse files
authored
Merge branch 'master' into EVSE_Add_Get_Set_Clear_Targets_Support
2 parents 88d1b22 + 8786012 commit 8735c45

File tree

2,132 files changed

+98576
-26890
lines changed

Some content is hidden

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

2,132 files changed

+98576
-26890
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/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

+7-2
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
@@ -332,7 +334,7 @@ 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
337+
pip3 install -r scripts/setup/requirements.setuppayload.txt
336338
python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool
337339
338340
build_linux_python_lighting_device:
@@ -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/chef.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
if: github.actor != 'restyled-io[bot]'
9999

100100
container:
101-
image: ghcr.io/project-chip/chip-build-telink:54
101+
image: ghcr.io/project-chip/chip-build-telink:57
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 0e8032dfef7e02498f34ba0b5d5d2df71a62adb1"
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/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-efr32.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
name: EFR32
3434

3535
env:
36-
SILABS_BOARD: BRD4161A
36+
SILABS_BOARD: BRD4187C
3737
BUILD_TYPE: gn_efr32
3838

3939
runs-on: ubuntu-latest
4040
if: github.actor != 'restyled-io[bot]'
4141

4242
container:
43-
image: ghcr.io/project-chip/chip-build-efr32:54
43+
image: ghcr.io/project-chip/chip-build-efr32:56
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

.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

+12-2
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,24 @@ jobs:
6161
- name: Build Linux tv-casting-app
6262
run: |
6363
./scripts/run_in_build_env.sh \
64-
"scripts/examples/gn_build_example.sh examples/tv-casting-app/linux/ out/tv-casting-app"
64+
"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-mbed.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,8 @@ jobs:
158158
rm -rf ./out
159159
160160
- name: Build unit tests
161-
# Temporarily disable build due to running out of flash space
161+
# Temporarily disabled build due to running out of flash space
162+
# TODO Issue #33978: re-enable unit testing after split of unit tests is done
162163
if: false
163164
run: scripts/tests/mbed/mbed_unit_tests.sh -b=$APP_TARGET -p=$APP_PROFILE
164165

.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/examples-telink.yaml

+2-2
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-telink:54
41+
image: ghcr.io/project-chip/chip-build-telink:57
4242
volumes:
4343
- "/tmp/bloat_reports:/tmp/bloat_reports"
4444

@@ -57,7 +57,7 @@ jobs:
5757
gh-context: ${{ toJson(github) }}
5858

5959
# - name: Update Zephyr to specific revision (for developers purpose)
60-
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 0e8032dfef7e02498f34ba0b5d5d2df71a62adb1"
60+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
6161

6262
- name: Build example Telink (B92 retention) Air Quality Sensor App
6363
run: |

.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/release_artifacts.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ jobs:
5858
efr32:
5959
name: EFR32
6060
env:
61-
SILABS_BOARD: BRD4161A
62-
BUILD_DIRECTORY: out/lock_app_debug/BRD4161A
61+
SILABS_BOARD: BRD4187C
62+
BUILD_DIRECTORY: out/lock_app_debug/BRD4187C
6363

6464
runs-on: ubuntu-latest
6565

6666
container:
67-
image: ghcr.io/project-chip/chip-build-efr32:54
67+
image: ghcr.io/project-chip/chip-build-efr32:56
6868
steps:
6969
- name: Checkout
7070
uses: actions/checkout@v4

0 commit comments

Comments
 (0)