From f7dcbfee0a4756d76ba49d9dc0f8b95f8bee7070 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Fri, 14 May 2021 19:56:07 +0000 Subject: [PATCH] Default to arm64 cipd packages on arm macs Enough works in that config that it seems like a better default by now. Checking out, building, and uploading patches works (but uploading still requires `--bypass-hooks` for now until crbug.com/1205263 is fixed). (In case something important I'm not aware of breaks, we can revert this.) Bug: 1103236,1205263 Change-Id: Id432ffd4ab19b15c019614953a2cefa787b46225 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2896468 Reviewed-by: Dirk Pranke Commit-Queue: Nico Weber --- cipd | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cipd b/cipd index 545065987..91fbe1650 100755 --- a/cipd +++ b/cipd @@ -30,11 +30,6 @@ case "${UNAME}" in ;; darwin) OS=mac - # use amd64 binaries even on arm64 for now, see crbug.com/1205263 - # Once we have arm binaries of everything, this will change to "arm64" - # Run `echo "mac-arm64" > .cipd_client_platform` to force arm64 binaries - # before everything is ready, for testing. - ARCH=amd64 ;; *) >&2 echo "CIPD not supported on ${UNAME}"