Skip to content

Commit

Permalink
Align naming in Content Launcher cluster XML with the spec. (#24507)
Browse files Browse the repository at this point in the history
* Align naming in Content Launcher cluster XML with the spec.

* Fix naming of LauncherResponse

* Update ZAP to fix bug with same-named response commands.

* Auto-update ZAP files.

* Regenerate generated files.

* Fix java codegen assuming two clusters will not have response commands with the same name.
  • Loading branch information
bzbarsky-apple authored Jan 23, 2023
1 parent 8f926b8 commit 43dd327
Show file tree
Hide file tree
Showing 101 changed files with 1,247 additions and 1,048 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bloat_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build:0.6.32
image: connectedhomeip/chip-build:0.6.34

steps:
- uses: Wandalen/wretry.action@v1.0.36
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build.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: connectedhomeip/chip-build:0.6.32
image: connectedhomeip/chip-build:0.6.34
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.32
image: connectedhomeip/chip-build:0.6.34
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -298,7 +298,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.32
image: connectedhomeip/chip-build:0.6.34
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down Expand Up @@ -356,8 +356,8 @@ jobs:
env:
# NOTE: Generally kept in sync within the repo using
# scripts/tools/zap/version_update.py
ZAP_VERSION: v2023.01.18-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
ZAP_VERSION: v2023.01.19-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly

steps:
- uses: Wandalen/wretry.action@v1.0.36
Expand Down Expand Up @@ -471,7 +471,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.32
image: connectedhomeip/chip-build:0.6.34
volumes:
- "/tmp/log_output:/tmp/test_logs"
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.32
image: connectedhomeip/chip-build:0.6.34
options: --user root

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

container:
image: connectedhomeip/chip-build-esp32:0.6.32
image: connectedhomeip/chip-build-esp32:0.6.34
options: --user root

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

container:
image: connectedhomeip/chip-build-nrf-platform:0.6.32
image: connectedhomeip/chip-build-nrf-platform:0.6.34
options: --user root

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cirque.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
timeout-minutes: 90

env:
DOCKER_RUN_VERSION: 0.6.32
DOCKER_RUN_VERSION: 0.6.34
GITHUB_CACHE_PATH: /tmp/cirque-cache/

runs-on: ubuntu-latest
Expand All @@ -38,7 +38,7 @@ jobs:
# need to run with privilege, which isn't supported by job.XXX.contaner
# https://github.com/actions/container-action/issues/2
# container:
# image: connectedhomeip/chip-build-cirque:0.6.32
# image: connectedhomeip/chip-build-cirque:0.6.34
# volumes:
# - "/tmp:/tmp"
# - "/dev/pts:/dev/pts"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ jobs:
LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
# NOTE: Generally kept in sync within the repo using
# scripts/tools/zap/version_update.py
ZAP_VERSION: v2023.01.18-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
ZAP_VERSION: v2023.01.19-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly

if: github.actor != 'restyled-io[bot]'
runs-on: macos-latest
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ jobs:
# NOTE: Generally kept in sync within the repo using
# scripts/tools/zap/version_update.py
# This is scoped to only the steps that don't use xcodebuild.
ZAP_VERSION: v2023.01.18-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
ZAP_VERSION: v2023.01.19-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
- name: Bootstrap
timeout-minutes: 25
run: scripts/build/gn_bootstrap.sh
Expand Down Expand Up @@ -126,8 +126,8 @@ jobs:
# NOTE: Generally kept in sync within the repo using
# scripts/tools/zap/version_update.py
# This is scoped to only the steps that don't use xcodebuild.
ZAP_VERSION: v2023.01.18-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
ZAP_VERSION: v2023.01.19-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
- name: Build example OTA Provider
timeout-minutes: 10
run: |
Expand All @@ -136,8 +136,8 @@ jobs:
# NOTE: Generally kept in sync within the repo using
# scripts/tools/zap/version_update.py
# This is scoped to only the steps that don't use xcodebuild.
ZAP_VERSION: v2023.01.18-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
ZAP_VERSION: v2023.01.19-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
- name: Build example OTA Requestor
timeout-minutes: 10
run: |
Expand All @@ -146,8 +146,8 @@ jobs:
# NOTE: Generally kept in sync within the repo using
# scripts/tools/zap/version_update.py
# This is scoped to only the steps that don't use xcodebuild.
ZAP_VERSION: v2023.01.18-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
ZAP_VERSION: v2023.01.19-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly
- name: Delete Defaults
run: defaults delete com.apple.dt.xctest.tool
continue-on-error: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:

runs-on: ubuntu-20.04
container:
image: connectedhomeip/chip-build-doxygen:0.6.32
image: connectedhomeip/chip-build-doxygen:0.6.34

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 @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-ameba:0.6.32
image: connectedhomeip/chip-build-ameba:0.6.34
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 @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-bouffalolab:0.6.32
image: connectedhomeip/chip-build-bouffalolab:0.6.34
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-cc13x2x7_26x2x7.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: connectedhomeip/chip-build-ti:0.6.32
image: connectedhomeip/chip-build-ti:0.6.34
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 @@ -38,7 +38,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-efr32:0.6.32
image: connectedhomeip/chip-build-efr32:0.6.34
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 @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-esp32:0.6.32
image: connectedhomeip/chip-build-esp32:0.6.34
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

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

container:
image: connectedhomeip/chip-build-esp32:0.6.32
image: connectedhomeip/chip-build-esp32:0.6.34
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 @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-infineon:0.6.32
image: connectedhomeip/chip-build-infineon:0.6.34
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-k32w.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: connectedhomeip/chip-build-k32w:0.6.32
image: connectedhomeip/chip-build-k32w:0.6.34
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
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 @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-crosscompile:0.6.32
image: connectedhomeip/chip-build-crosscompile:0.6.34
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 @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-imx:0.6.32
image: connectedhomeip/chip-build-imx:0.6.34

steps:
- uses: Wandalen/wretry.action@v1.0.36
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 @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.32
image: connectedhomeip/chip-build:0.6.34
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-mbed.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: connectedhomeip/chip-build-mbed-os:0.6.32
image: connectedhomeip/chip-build-mbed-os:0.6.34
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

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 @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.32
image: connectedhomeip/chip-build:0.6.34
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 @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-nrf-platform:0.6.32
image: connectedhomeip/chip-build-nrf-platform:0.6.34
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

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 @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-openiotsdk:0.6.32
image: connectedhomeip/chip-build-openiotsdk:0.6.34
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 @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.32
image: connectedhomeip/chip-build:0.6.34
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-telink.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: connectedhomeip/chip-build-telink:0.6.32
image: connectedhomeip/chip-build-telink:0.6.34
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

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 @@ -33,7 +33,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-tizen:0.6.32
image: connectedhomeip/chip-build-tizen:0.6.34
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 @@ -37,7 +37,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build-android:0.6.32
image: connectedhomeip/chip-build-android:0.6.34
volumes:
- "/tmp/log_output:/tmp/test_logs"

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/fuzzing-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.32
image: connectedhomeip/chip-build:0.6.34
volumes:
- "/tmp/log_output:/tmp/test_logs"

Expand Down Expand Up @@ -91,8 +91,8 @@ jobs:
env:
# NOTE: Generally kept in sync within the repo using
# scripts/tools/zap/version_update.py
ZAP_VERSION: v2023.01.18-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.18-nightly
ZAP_VERSION: v2023.01.19-nightly
ZAP_INSTALL_PATH: /usr/local/zap/zap-v2023.01.19-nightly

steps:
- uses: Wandalen/wretry.action@v1.0.36
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: connectedhomeip/chip-build:0.6.32
image: connectedhomeip/chip-build:0.6.34

steps:
- uses: Wandalen/wretry.action@v1.0.36
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/qemu.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: connectedhomeip/chip-build-esp32-qemu:0.6.32
image: connectedhomeip/chip-build-esp32-qemu:0.6.34
volumes:
- "/tmp/log_output:/tmp/test_logs"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build-esp32:0.6.32
image: connectedhomeip/chip-build-esp32:0.6.34

steps:
- uses: Wandalen/wretry.action@v1.0.36
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: connectedhomeip/chip-build-efr32:0.6.32
image: connectedhomeip/chip-build-efr32:0.6.34
steps:
- uses: Wandalen/wretry.action@v1.0.36
name: Checkout
Expand Down
Loading

0 comments on commit 43dd327

Please sign in to comment.