From 840b0b97cd150f539f8c3fb67b919596ef47b37e Mon Sep 17 00:00:00 2001 From: Boris Zbarsky Date: Mon, 10 Jun 2024 17:57:31 -0400 Subject: [PATCH] Update ZAP to fix codegen for nullable attributes. (#33834) Fixes https://github.com/project-chip/connectedhomeip/issues/33413 MIN_ZAP_VERSION is set differently from the tag being used, because the actual changeset tagged with that tag is from 2024-06-06, not 2024-06-10. --- scripts/setup/zap.json | 4 ++-- scripts/setup/zap.version | 2 +- scripts/tools/zap/zap_execution.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json index 4e7da8f6d30a7c..c3e65c8bab9752 100644 --- a/scripts/setup/zap.json +++ b/scripts/setup/zap.json @@ -8,13 +8,13 @@ "mac-amd64", "windows-amd64" ], - "tags": ["version:2@v2024.04.15-nightly.1"] + "tags": ["version:2@v2024.06.10-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@v2024.04.15-nightly.1"] + "tags": ["version:2@v2024.06.10-nightly.1"] } ] } diff --git a/scripts/setup/zap.version b/scripts/setup/zap.version index cdc8952361f654..8b3c20afc891f6 100644 --- a/scripts/setup/zap.version +++ b/scripts/setup/zap.version @@ -1 +1 @@ -v2024.04.15-nightly +v2024.06.10-nightly diff --git a/scripts/tools/zap/zap_execution.py b/scripts/tools/zap/zap_execution.py index 3256ba069c2790..80def9602dce77 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 = '2024.4.15' +MIN_ZAP_VERSION = '2024.6.6' class ZapTool: