From 2173abb3ea6cc11a1fe4924ef285a3be940f1c38 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 23 May 2023 11:33:29 -0400 Subject: [PATCH] Force fetching x64 zap for mac even on arm. (#26747) * Force fetching x64 zap for mac even on arm. Apparently arm64 version of zap was pulled. Rosetta can run x64 just fine, so start using that instead. * Update scripts/setup/zap.json Co-authored-by: Boris Zbarsky * Update scripts/setup/zap.json Co-authored-by: Boris Zbarsky * Update scripts/setup/zap.json Co-authored-by: Boris Zbarsky * Restyled by prettier-json --------- Co-authored-by: Andrei Litvin Co-authored-by: Boris Zbarsky Co-authored-by: Restyled.io --- scripts/setup/zap.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/setup/zap.json b/scripts/setup/zap.json index 48e3ac92c77d51..c14e811f900208 100644 --- a/scripts/setup/zap.json +++ b/scripts/setup/zap.json @@ -6,10 +6,15 @@ "linux-amd64", "linux-arm64", "mac-amd64", - "mac-arm64", "windows-amd64" ], "tags": ["version:2@v2023.05.22-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.05.22-nightly.1"] } ] }