From 17500770d247371aed9220d81ed1a57afa0c9f42 Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Wed, 2 Aug 2023 15:10:38 -0400 Subject: [PATCH] Update ZAP to pick up UI for multiple device types on an endpoint. (#28423) --- .../log-source-app/log-source-common/log-source-app.matter | 1 + scripts/setup/zap.json | 4 ++-- scripts/setup/zap.version | 2 +- scripts/tools/zap/zap_execution.py | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/examples/log-source-app/log-source-common/log-source-app.matter b/examples/log-source-app/log-source-common/log-source-app.matter index ee666599859620..7308cbab74cd68 100644 --- a/examples/log-source-app/log-source-common/log-source-app.matter +++ b/examples/log-source-app/log-source-common/log-source-app.matter @@ -498,6 +498,7 @@ server cluster OperationalCredentials = 62 { } endpoint 0 { + device type anonymousEndpointType = 0, version 1; binding cluster DiagnosticLogs; server cluster AccessControl { diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json index 74901d88faf06b..95b8b0a56c4495 100644 --- a/scripts/setup/zap.json +++ b/scripts/setup/zap.json @@ -8,13 +8,13 @@ "mac-amd64", "windows-amd64" ], - "tags": ["version:2@v2023.07.21-nightly.1"] + "tags": ["version:2@v2023.08.01-nightly.1"] }, { "_comment": "Always get the amd64 version on mac until usable arm64 zap build is available", "path": "fuchsia/third_party/zap/mac-amd64", "platforms": ["mac-arm64"], - "tags": ["version:2@v2023.07.21-nightly.1"] + "tags": ["version:2@v2023.08.01-nightly.1"] } ] } diff --git a/scripts/setup/zap.version b/scripts/setup/zap.version index 543bb412a09ac6..ea7688be7708a5 100644 --- a/scripts/setup/zap.version +++ b/scripts/setup/zap.version @@ -1 +1 @@ -v2023.07.21-nightly +v2023.08.01-nightly diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py index 6a07e8eb08a320..9db6537dc32e8d 100644 --- a/scripts/tools/zap/zap_execution.py +++ b/scripts/tools/zap/zap_execution.py @@ -23,7 +23,7 @@ # Use scripts/tools/zap/version_update.py to manage ZAP versioning as many # files may need updating for versions # -MIN_ZAP_VERSION = '2023.7.20' +MIN_ZAP_VERSION = '2023.8.1' class ZapTool: