Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into camera-webrtc-pro…
Browse files Browse the repository at this point in the history
…vider

# 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
  • Loading branch information
gmarcosb committed Oct 1, 2024
2 parents fb583bf + 83159c2 commit b4b2461
Show file tree
Hide file tree
Showing 187 changed files with 4,114 additions and 5,519 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bloat_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build:80
image: ghcr.io/project-chip/chip-build:81

steps:
- name: Checkout
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:80
image: ghcr.io/project-chip/chip-build:81
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:80
image: ghcr.io/project-chip/chip-build:81
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -283,7 +283,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:80
image: ghcr.io/project-chip/chip-build:81
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -346,7 +346,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:80
image: ghcr.io/project-chip/chip-build:81
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -457,7 +457,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:80
image: ghcr.io/project-chip/chip-build:81
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:80
image: ghcr.io/project-chip/chip-build:81
options: --user root

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

container:
image: ghcr.io/project-chip/chip-build-esp32:80
image: ghcr.io/project-chip/chip-build-esp32:81
options: --user root

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

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

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

container:
image: ghcr.io/project-chip/chip-build-telink:80
image: ghcr.io/project-chip/chip-build-telink:81
options: --user root

steps:
Expand All @@ -110,7 +110,7 @@ jobs:
platform: telink
# - name: Update Zephyr to specific revision (for developers purpose)
# shell: bash
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 3ed7686a9378de6be1368c912f9a42f998bbfb18"
- name: CI Examples Telink
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

strategy:
matrix:
build_variant: [no-ble-asan-clang]
build_variant: [no-ble-no-shell-asan-clang]
env:
BUILD_VARIANT: ${{matrix.build_variant}}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:

runs-on: ubuntu-latest
container:
image: ghcr.io/project-chip/chip-build-doxygen:80
image: ghcr.io/project-chip/chip-build-doxygen:81

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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-ameba.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ameba:80
image: ghcr.io/project-chip/chip-build-ameba:81
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-asr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-asr:80
image: ghcr.io/project-chip/chip-build-asr:81
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-bouffalolab.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-bouffalolab:80
image: ghcr.io/project-chip/chip-build-bouffalolab:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-cc13xx_26xx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ti:80
image: ghcr.io/project-chip/chip-build-ti:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-cc32xx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-ti:80
image: ghcr.io/project-chip/chip-build-ti:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-efr32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-efr32:80
image: ghcr.io/project-chip/chip-build-efr32:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/examples-esp32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-esp32:80
image: ghcr.io/project-chip/chip-build-esp32:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

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

container:
image: ghcr.io/project-chip/chip-build-esp32:80
image: ghcr.io/project-chip/chip-build-esp32:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-infineon.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-infineon:80
image: ghcr.io/project-chip/chip-build-infineon:81
env:
# TODO: this should probably be part of the dockerfile itself
CY_TOOLS_PATHS: /opt/Tools/ModusToolbox/tools_3.2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-linux-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-crosscompile:80
image: ghcr.io/project-chip/chip-build-crosscompile:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-linux-imx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-imx:80
image: ghcr.io/project-chip/chip-build-imx:81

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-linux-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:80
image: ghcr.io/project-chip/chip-build:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-linux-tv-casting-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:80
image: ghcr.io/project-chip/chip-build:81

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-mw320.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:80
image: ghcr.io/project-chip/chip-build:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-nrfconnect.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-nrf-platform:80
image: ghcr.io/project-chip/chip-build-nrf-platform:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-nuttx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-nuttx:80
image: ghcr.io/project-chip/chip-build-nuttx:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/examples-nxp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-nxp:80
image: ghcr.io/project-chip/chip-build-nxp:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-nxp:80
image: ghcr.io/project-chip/chip-build-nxp:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down Expand Up @@ -218,7 +218,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-nxp:80
image: ghcr.io/project-chip/chip-build-nxp:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down Expand Up @@ -279,7 +279,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-nxp-zephyr:80
image: ghcr.io/project-chip/chip-build-nxp-zephyr:81

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-openiotsdk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-openiotsdk:80
image: ghcr.io/project-chip/chip-build-openiotsdk:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
options: --privileged
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-qpg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:80
image: ghcr.io/project-chip/chip-build:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-stm32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:80
image: ghcr.io/project-chip/chip-build:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/examples-telink.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-telink:80
image: ghcr.io/project-chip/chip-build-telink:81
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

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

# - name: Update Zephyr to specific revision (for developers purpose)
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py ab81a585fca6a83b30e1f4e58a021113d6a3acb8"
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 3ed7686a9378de6be1368c912f9a42f998bbfb18"

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

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

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

- name: Build example Telink (W91) Window Covering App
continue-on-error: true
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9118bdk40d-window-covering' build"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-tizen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-tizen:80
image: ghcr.io/project-chip/chip-build-tizen:81
options: --user root
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/full-android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-android:80
image: ghcr.io/project-chip/chip-build-android:81
volumes:
- "/tmp/log_output:/tmp/test_logs"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fuzzing-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:80
image: ghcr.io/project-chip/chip-build:81
volumes:
- "/tmp/log_output:/tmp/test_logs"

Expand Down
Loading

0 comments on commit b4b2461

Please sign in to comment.