From 3792658e8d087f9cfb88e8d0c7954d0bd4933182 Mon Sep 17 00:00:00 2001 From: Ted Pudlik Date: Thu, 26 Jan 2023 13:23:42 -0800 Subject: [PATCH] Add zap to CIPD setup (#24630) * Add zap to CIPD setup This makes the tool available for running the tests. * Add to zap version update script Remove arm64 version, since the prebuilt zap-linux is for amd64 only. Co-authored-by: Boris Zbarsky --- scripts/environment.json | 3 ++- scripts/tools/zap/version_update.py | 1 + scripts/zap.json | 9 +++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 scripts/zap.json diff --git a/scripts/environment.json b/scripts/environment.json index e86227fad22c3f..a4bd51be5f2f52 100644 --- a/scripts/environment.json +++ b/scripts/environment.json @@ -2,7 +2,8 @@ "cipd_package_files": [ "third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup/arm.json", "third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json", - "scripts/python.json" + "scripts/python.json", + "scripts/zap.json" ], "virtualenv": { "gn_root": ".", diff --git a/scripts/tools/zap/version_update.py b/scripts/tools/zap/version_update.py index 152db957d492dc..9d577913139130 100755 --- a/scripts/tools/zap/version_update.py +++ b/scripts/tools/zap/version_update.py @@ -55,6 +55,7 @@ '.github/workflows/fuzzing-build.yaml', '.github/workflows/tests.yaml', 'integrations/docker/images/chip-cert-bins/Dockerfile', + 'scripts/zap.json', ] # Note that chip-cert-bits is assumed USAGE on purpose (it compiles code) diff --git a/scripts/zap.json b/scripts/zap.json new file mode 100644 index 00000000000000..a130ca65df7c0d --- /dev/null +++ b/scripts/zap.json @@ -0,0 +1,9 @@ +{ + "packages": [ + { + "path": "fuchsia/third_party/zap/${platform}", + "platforms": ["linux-amd64", "mac-amd64", "windows-amd64"], + "tags": ["version:2@v2023.01.19-nightly.1"] + } + ] +}