Merge branch 'master' into window-app-demo

project-chip · Feb 26, 2023 · 0e9e461 · 0e9e461
2 parents b0a5d76 + 3b80154
commit 0e9e461
Show file tree

Hide file tree

Showing 18 changed files with 581 additions and 553 deletions.
diff --git a/integrations/docker/images/chip-cert-bins/Dockerfile b/integrations/docker/images/chip-cert-bins/Dockerfile
@@ -7,7 +7,7 @@ ARG COMMITHASH=7b99e6399c6069037c613782d78132c69b9dcabb
 # ZAP Development install, so that it runs on both x64 and arm64
 # Generally this should match with the ZAP version that is used for codegen within the
 # specified SHA
-ARG ZAP_VERSION=v2023.02.16-nightly
+ARG ZAP_VERSION=v2023.02.25-nightly
 
 # Ensure TARGETPLATFORM is set
 RUN case ${TARGETPLATFORM} in \

diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json
@@ -8,7 +8,7 @@
  "mac-arm64",
  "windows-amd64"
  ],
- "tags": ["version:2@v2023.02.16-nightly.1"]
+ "tags": ["version:2@v2023.02.25-nightly.1"]
  }
  ]
 }