Skip to content

Commit 95492a0

Browse files
lazarkovlazarkov
authored
Merge branch 'master' into feature/fix-cdc-passcode-cancel
2 parents 7b1e161 + 26c816a commit 95492a0

File tree

371 files changed

+34533
-4412
lines changed

Some content is hidden

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

371 files changed

+34533
-4412
lines changed

‎.github/workflows/chef.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
if: github.actor != 'restyled-io[bot]'
5757

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

6262
steps:

‎.github/workflows/examples-esp32.yaml

+2-2
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-esp32:66
39+
image: ghcr.io/project-chip/chip-build-esp32:67
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

@@ -126,7 +126,7 @@ jobs:
126126
if: github.actor != 'restyled-io[bot]'
127127

128128
container:
129-
image: ghcr.io/project-chip/chip-build-esp32:66
129+
image: ghcr.io/project-chip/chip-build-esp32:67
130130
volumes:
131131
- "/tmp/bloat_reports:/tmp/bloat_reports"
132132

‎.github/workflows/examples-nxp.yaml

+64
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,71 @@ jobs:
9696
if: ${{ !env.ACT }}
9797
with:
9898
platform-name: K32W
99+
rw61x:
100+
name: RW61X
99101

102+
env:
103+
BUILD_TYPE: gn_rw61x
104+
105+
runs-on: ubuntu-latest
106+
if: github.actor != 'restyled-io[bot]'
107+
108+
container:
109+
image: ghcr.io/project-chip/chip-build-rw61x:66
110+
volumes:
111+
- "/tmp/bloat_reports:/tmp/bloat_reports"
112+
steps:
113+
- name: Checkout
114+
uses: actions/checkout@v4
115+
- name: Checkout submodules & Bootstrap
116+
uses: ./.github/actions/checkout-submodules-and-bootstrap
117+
with:
118+
platform: nxp
119+
extra-submodule-parameters: --recursive
120+
121+
- name: Set up environment for size reports
122+
uses: ./.github/actions/setup-size-reports
123+
if: ${{ !env.ACT }}
124+
with:
125+
gh-context: ${{ toJson(github) }}
126+
127+
- name: Build RW61X all clusters example app
128+
run: |
129+
scripts/run_in_build_env.sh "\
130+
./scripts/build/build_examples.py \
131+
--target nxp-rw61x-freertos-all-clusters-wifi \
132+
--target nxp-rw61x-freertos-all-clusters-thread \
133+
--target nxp-rw61x-freertos-all-clusters-thread-wifi \
134+
build \
135+
--copy-artifacts-to out/artifacts \
136+
"
137+
138+
- name: Build RW61X thermostat example app
139+
run: |
140+
scripts/run_in_build_env.sh "\
141+
./scripts/build/build_examples.py \
142+
--target nxp-rw61x-freertos-thermostat-wifi \
143+
--target nxp-rw61x-freertos-thermostat-thread \
144+
--target nxp-rw61x-freertos-thermostat-thread-wifi \
145+
build \
146+
--copy-artifacts-to out/artifacts \
147+
"
148+
149+
- name: Build RW61X laundry-washer example app
150+
run: |
151+
scripts/run_in_build_env.sh "\
152+
./scripts/build/build_examples.py \
153+
--target nxp-rw61x-freertos-laundry-washer-wifi \
154+
--target nxp-rw61x-freertos-laundry-washer-thread \
155+
--target nxp-rw61x-freertos-laundry-washer-thread-wifi \
156+
build \
157+
--copy-artifacts-to out/artifacts \
158+
"
159+
- name: Uploading Size Reports
160+
uses: ./.github/actions/upload-size-reports
161+
if: ${{ !env.ACT }}
162+
with:
163+
platform-name: RW61X
100164
zephyr:
101165
name: ZEPHYR_RW61X
102166

‎.github/workflows/examples-rw61x.yaml

-96
This file was deleted.

‎.github/workflows/lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ jobs:
290290
git grep -I -n 'emberAfWriteAttribute' -- './*' \
291291
':(exclude).github/workflows/lint.yml' \
292292
':(exclude)examples/common/pigweed/rpc_services/Attributes.h' \
293-
':(exclude)src/app/codegen-data-model/CodegenDataModel_Write.cpp' \
294-
':(exclude)src/app/codegen-data-model/tests/EmberReadWriteOverride.cpp' \
293+
':(exclude)src/app/codegen-data-model-provider/CodegenDataModelProvider_Write.cpp' \
294+
':(exclude)src/app/codegen-data-model-provider/tests/EmberReadWriteOverride.cpp' \
295295
':(exclude)src/app/util/attribute-table.cpp' \
296296
':(exclude)src/app/util/attribute-table.h' \
297297
':(exclude)src/app/util/ember-compatibility-functions.cpp' \

‎.github/workflows/qemu.yaml

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

4242
container:
43-
image: ghcr.io/project-chip/chip-build-esp32-qemu:66
43+
image: ghcr.io/project-chip/chip-build-esp32-qemu:67
4444
volumes:
4545
- "/tmp/log_output:/tmp/test_logs"
4646

@@ -75,7 +75,12 @@ jobs:
7575
name: Tizen
7676

7777
runs-on: ubuntu-latest
78-
if: github.actor != 'restyled-io[bot]'
78+
# NOTE: job temporarely disabled as it seems flaky. The flake does not result in usable
79+
# logs so the current theory is that we run out of space. This is unusual as
80+
# larger docker images succeed at bootstrap, however it needs more investigation
81+
# to detect an exact/real root cause.
82+
if: false
83+
# if: github.actor != 'restyled-io[bot]'
7984

8085
container:
8186
image: ghcr.io/project-chip/chip-build-tizen-qemu:54

‎.github/workflows/release_artifacts.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333

3434
container:
35-
image: ghcr.io/project-chip/chip-build-esp32:66
35+
image: ghcr.io/project-chip/chip-build-esp32:67
3636

3737
steps:
3838
- name: Checkout

‎.github/workflows/tests.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -511,6 +511,7 @@ jobs:
511511
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_AccessChecker.py'
512512
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_CC_2_2.py'
513513
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_CC_10_1.py'
514+
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_CADMIN_1_9.py'
514515
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_CGEN_2_4.py'
515516
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_CNET_1_4.py'
516517
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_DA_1_2.py'
@@ -571,13 +572,17 @@ jobs:
571572
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'
572573
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'
573574
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'
575+
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_OCC_2_1.py'
576+
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_OCC_2_2.py'
577+
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_OCC_2_3.py'
574578
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'
575579
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'
576580
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'
577581
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'
578582
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_3.py'
579583
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_4.py'
580584
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_5.py'
585+
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_6.py'
581586
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_OVENOPSTATE_2_1.py'
582587
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_OVENOPSTATE_2_2.py'
583588
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_OVENOPSTATE_2_3.py'

‎docs/tools/index.md

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ Source files for these tools are located at `scripts/tools`.
4949
:maxdepth: 1
5050
5151
../scripts/tools/silabs/README
52+
../scripts/tools/silabs/ota/README
53+
../scripts/tools/silabs/factory_data_generator/README
5254
5355
```
5456

0 commit comments

Comments
 (0)