Skip to content

Commit b4b2461

Browse files
gmarcosbgmarcosb
committed
Merge remote-tracking branch 'upstream/master' into camera-webrtc-provider
# Conflicts: # docs/zap_clusters.md # src/controller/data_model/controller-clusters.matter # src/controller/java/generated/java/chip/devicecontroller/ChipClusters.java # src/controller/java/generated/java/chip/devicecontroller/ChipStructs.java # src/controller/java/generated/java/chip/devicecontroller/ClusterIDMapping.java # src/controller/java/generated/java/chip/devicecontroller/ClusterInfoMapping.java # src/controller/java/generated/java/chip/devicecontroller/ClusterReadMapping.java # src/controller/java/generated/java/chip/devicecontroller/ClusterWriteMapping.java # src/controller/java/zap-generated/CHIPAttributeTLVValueDecoder.cpp # src/controller/java/zap-generated/CHIPEventTLVValueDecoder.cpp # src/controller/python/chip/clusters/CHIPClusters.py # src/controller/python/chip/clusters/Objects.py # src/darwin/Framework/CHIP/zap-generated/MTRAttributeSpecifiedCheck.mm # src/darwin/Framework/CHIP/zap-generated/MTRAttributeTLVValueDecoder.mm # src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.h # src/darwin/Framework/CHIP/zap-generated/MTRBaseClusters.mm # src/darwin/Framework/CHIP/zap-generated/MTRClusterConstants.h # src/darwin/Framework/CHIP/zap-generated/MTRClusterNames.mm # src/darwin/Framework/CHIP/zap-generated/MTRClusters.h # src/darwin/Framework/CHIP/zap-generated/MTRClusters.mm # src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.h # src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloadsObjc.mm # src/darwin/Framework/CHIP/zap-generated/MTRCommandPayloads_Internal.h # src/darwin/Framework/CHIP/zap-generated/MTRCommandTimedCheck.mm # src/darwin/Framework/CHIP/zap-generated/MTREventTLVValueDecoder.mm # src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.h # src/darwin/Framework/CHIP/zap-generated/MTRStructsObjc.mm # zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp # zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.h # zzz_generated/app-common/app-common/zap-generated/callback.h # zzz_generated/app-common/app-common/zap-generated/cluster-enums.h # zzz_generated/app-common/app-common/zap-generated/cluster-objects.cpp # zzz_generated/app-common/app-common/zap-generated/cluster-objects.h # zzz_generated/app-common/app-common/zap-generated/ids/Attributes.h # zzz_generated/app-common/app-common/zap-generated/ids/Clusters.h # zzz_generated/app-common/app-common/zap-generated/ids/Commands.h # zzz_generated/chip-tool/zap-generated/cluster/Commands.h # zzz_generated/chip-tool/zap-generated/cluster/logging/DataModelLogger.cpp # zzz_generated/chip-tool/zap-generated/cluster/logging/EntryToText.cpp # zzz_generated/darwin-framework-tool/zap-generated/cluster/Commands.h
2 parents fb583bf + 83159c2 commit b4b2461

File tree

187 files changed

+4114
-5519
lines changed

Some content is hidden

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

187 files changed

+4114
-5519
lines changed

‎.github/workflows/bloat_check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
runs-on: ubuntu-latest
3535

3636
container:
37-
image: ghcr.io/project-chip/chip-build:80
37+
image: ghcr.io/project-chip/chip-build:81
3838

3939
steps:
4040
- name: Checkout

‎.github/workflows/build.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
if: github.actor != 'restyled-io[bot]'
4343

4444
container:
45-
image: ghcr.io/project-chip/chip-build:80
45+
image: ghcr.io/project-chip/chip-build:81
4646
volumes:
4747
- "/:/runner-root-volume"
4848
- "/tmp/log_output:/tmp/test_logs"
@@ -138,7 +138,7 @@ jobs:
138138
if: github.actor != 'restyled-io[bot]'
139139

140140
container:
141-
image: ghcr.io/project-chip/chip-build:80
141+
image: ghcr.io/project-chip/chip-build:81
142142
volumes:
143143
- "/:/runner-root-volume"
144144
- "/tmp/log_output:/tmp/test_logs"
@@ -283,7 +283,7 @@ jobs:
283283
if: github.actor != 'restyled-io[bot]'
284284

285285
container:
286-
image: ghcr.io/project-chip/chip-build:80
286+
image: ghcr.io/project-chip/chip-build:81
287287
volumes:
288288
- "/:/runner-root-volume"
289289
- "/tmp/log_output:/tmp/test_logs"
@@ -346,7 +346,7 @@ jobs:
346346
if: github.actor != 'restyled-io[bot]'
347347

348348
container:
349-
image: ghcr.io/project-chip/chip-build:80
349+
image: ghcr.io/project-chip/chip-build:81
350350
volumes:
351351
- "/:/runner-root-volume"
352352
- "/tmp/log_output:/tmp/test_logs"
@@ -457,7 +457,7 @@ jobs:
457457
if: github.actor != 'restyled-io[bot]'
458458

459459
container:
460-
image: ghcr.io/project-chip/chip-build:80
460+
image: ghcr.io/project-chip/chip-build:81
461461
volumes:
462462
- "/:/runner-root-volume"
463463
- "/tmp/log_output:/tmp/test_logs"

‎.github/workflows/chef.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
if: github.actor != 'restyled-io[bot]'
3636

3737
container:
38-
image: ghcr.io/project-chip/chip-build:80
38+
image: ghcr.io/project-chip/chip-build:81
3939
options: --user root
4040

4141
steps:
@@ -56,7 +56,7 @@ jobs:
5656
if: github.actor != 'restyled-io[bot]'
5757

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

6262
steps:
@@ -77,7 +77,7 @@ jobs:
7777
if: github.actor != 'restyled-io[bot]'
7878

7979
container:
80-
image: ghcr.io/project-chip/chip-build-nrf-platform:80
80+
image: ghcr.io/project-chip/chip-build-nrf-platform:81
8181
options: --user root
8282

8383
steps:
@@ -98,7 +98,7 @@ jobs:
9898
if: github.actor != 'restyled-io[bot]'
9999

100100
container:
101-
image: ghcr.io/project-chip/chip-build-telink:80
101+
image: ghcr.io/project-chip/chip-build-telink:81
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 ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
113+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 3ed7686a9378de6be1368c912f9a42f998bbfb18"
114114
- name: CI Examples Telink
115115
shell: bash
116116
run: |

‎.github/workflows/darwin-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
strategy:
3939
matrix:
40-
build_variant: [no-ble-asan-clang]
40+
build_variant: [no-ble-no-shell-asan-clang]
4141
env:
4242
BUILD_VARIANT: ${{matrix.build_variant}}
4343

‎.github/workflows/doxygen.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181

8282
runs-on: ubuntu-latest
8383
container:
84-
image: ghcr.io/project-chip/chip-build-doxygen:80
84+
image: ghcr.io/project-chip/chip-build-doxygen:81
8585

8686
if: github.actor != 'restyled-io[bot]'
8787

‎.github/workflows/examples-ameba.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-ameba:80
41+
image: ghcr.io/project-chip/chip-build-ameba:81
4242
options: --user root
4343

4444
steps:

‎.github/workflows/examples-asr.yaml

+1-1
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-asr:80
39+
image: ghcr.io/project-chip/chip-build-asr:81
4040
options: --user root
4141

4242
steps:

‎.github/workflows/examples-bouffalolab.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-bouffalolab:80
40+
image: ghcr.io/project-chip/chip-build-bouffalolab:81
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"
4343
steps:

‎.github/workflows/examples-cc13xx_26xx.yaml

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

4343
container:
44-
image: ghcr.io/project-chip/chip-build-ti:80
44+
image: ghcr.io/project-chip/chip-build-ti:81
4545
volumes:
4646
- "/tmp/bloat_reports:/tmp/bloat_reports"
4747
steps:

‎.github/workflows/examples-cc32xx.yaml

+1-1
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-ti:80
43+
image: ghcr.io/project-chip/chip-build-ti:81
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/examples-efr32.yaml

+1-1
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-efr32:80
43+
image: ghcr.io/project-chip/chip-build-efr32:81
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
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:80
39+
image: ghcr.io/project-chip/chip-build-esp32:81
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:80
129+
image: ghcr.io/project-chip/chip-build-esp32:81
130130
volumes:
131131
- "/tmp/bloat_reports:/tmp/bloat_reports"
132132

‎.github/workflows/examples-infineon.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-infineon:80
40+
image: ghcr.io/project-chip/chip-build-infineon:81
4141
env:
4242
# TODO: this should probably be part of the dockerfile itself
4343
CY_TOOLS_PATHS: /opt/Tools/ModusToolbox/tools_3.2

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

+1-1
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-crosscompile:80
39+
image: ghcr.io/project-chip/chip-build-crosscompile:81
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

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

+1-1
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-imx:80
39+
image: ghcr.io/project-chip/chip-build-imx:81
4040

4141
steps:
4242
- name: Checkout

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

+1-1
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:80
39+
image: ghcr.io/project-chip/chip-build:81
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242

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

+1-1
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:80
39+
image: ghcr.io/project-chip/chip-build:81
4040

4141
steps:
4242
- name: Checkout

‎.github/workflows/examples-mw320.yaml

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

4141
container:
42-
image: ghcr.io/project-chip/chip-build:80
42+
image: ghcr.io/project-chip/chip-build:81
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-nrfconnect.yaml

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

4141
container:
42-
image: ghcr.io/project-chip/chip-build-nrf-platform:80
42+
image: ghcr.io/project-chip/chip-build-nrf-platform:81
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545

‎.github/workflows/examples-nuttx.yaml

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

3737
container:
38-
image: ghcr.io/project-chip/chip-build-nuttx:80
38+
image: ghcr.io/project-chip/chip-build-nuttx:81
3939
volumes:
4040
- "/tmp/bloat_reports:/tmp/bloat_reports"
4141
steps:

‎.github/workflows/examples-nxp.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
if: github.actor != 'restyled-io[bot]'
9797

9898
container:
99-
image: ghcr.io/project-chip/chip-build-nxp:80
99+
image: ghcr.io/project-chip/chip-build-nxp:81
100100
volumes:
101101
- "/tmp/bloat_reports:/tmp/bloat_reports"
102102
steps:
@@ -157,7 +157,7 @@ jobs:
157157
if: github.actor != 'restyled-io[bot]'
158158

159159
container:
160-
image: ghcr.io/project-chip/chip-build-nxp:80
160+
image: ghcr.io/project-chip/chip-build-nxp:81
161161
volumes:
162162
- "/tmp/bloat_reports:/tmp/bloat_reports"
163163
steps:
@@ -218,7 +218,7 @@ jobs:
218218
if: github.actor != 'restyled-io[bot]'
219219

220220
container:
221-
image: ghcr.io/project-chip/chip-build-nxp:80
221+
image: ghcr.io/project-chip/chip-build-nxp:81
222222
volumes:
223223
- "/tmp/bloat_reports:/tmp/bloat_reports"
224224
steps:
@@ -279,7 +279,7 @@ jobs:
279279
if: github.actor != 'restyled-io[bot]'
280280

281281
container:
282-
image: ghcr.io/project-chip/chip-build-nxp-zephyr:80
282+
image: ghcr.io/project-chip/chip-build-nxp-zephyr:81
283283

284284
steps:
285285
- name: Checkout

‎.github/workflows/examples-openiotsdk.yaml

+1-1
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-openiotsdk:80
39+
image: ghcr.io/project-chip/chip-build-openiotsdk:81
4040
volumes:
4141
- "/tmp/bloat_reports:/tmp/bloat_reports"
4242
options: --privileged

‎.github/workflows/examples-qpg.yaml

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

4141
container:
42-
image: ghcr.io/project-chip/chip-build:80
42+
image: ghcr.io/project-chip/chip-build:81
4343
volumes:
4444
- "/tmp/bloat_reports:/tmp/bloat_reports"
4545
steps:

‎.github/workflows/examples-stm32.yaml

+1-1
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:80
43+
image: ghcr.io/project-chip/chip-build:81
4444
volumes:
4545
- "/tmp/bloat_reports:/tmp/bloat_reports"
4646
steps:

‎.github/workflows/examples-telink.yaml

+5-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:80
41+
image: ghcr.io/project-chip/chip-build-telink:81
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 ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
60+
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 3ed7686a9378de6be1368c912f9a42f998bbfb18"
6161

6262
- name: Build example Telink (B92 retention) Air Quality Sensor App
6363
run: |
@@ -72,6 +72,7 @@ jobs:
7272
run: rm -rf ./out
7373

7474
- name: Build example Telink (W91) All Clusters App
75+
continue-on-error: true
7576
run: |
7677
./scripts/run_in_build_env.sh \
7778
"./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-all-clusters' build"
@@ -130,6 +131,7 @@ jobs:
130131
run: rm -rf ./out/telink*
131132

132133
- name: Build example Telink (W91) Lighting App with OTA, Factory Data
134+
continue-on-error: true
133135
run: |
134136
./scripts/run_in_build_env.sh \
135137
"./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-light-ota-factory-data' build"
@@ -262,6 +264,7 @@ jobs:
262264
run: rm -rf ./out
263265

264266
- name: Build example Telink (W91) Window Covering App
267+
continue-on-error: true
265268
run: |
266269
./scripts/run_in_build_env.sh \
267270
"./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-window-covering' build"

‎.github/workflows/examples-tizen.yaml

+1-1
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-tizen:80
39+
image: ghcr.io/project-chip/chip-build-tizen:81
4040
options: --user root
4141
volumes:
4242
- "/tmp/bloat_reports:/tmp/bloat_reports"

‎.github/workflows/full-android.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-android:80
41+
image: ghcr.io/project-chip/chip-build-android:81
4242
volumes:
4343
- "/tmp/log_output:/tmp/test_logs"
4444

‎.github/workflows/fuzzing-build.yaml

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

3535
container:
36-
image: ghcr.io/project-chip/chip-build:80
36+
image: ghcr.io/project-chip/chip-build:81
3737
volumes:
3838
- "/tmp/log_output:/tmp/test_logs"
3939

0 commit comments

Comments
 (0)