From 3a56ba9d9c9d22bc78e24f96a9096247d53649f8 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Thu, 29 Apr 2021 02:09:24 +0000 Subject: [PATCH] [mac/arm] pull python3 binary in cipd bootstrap now that it exists With this, it's possible to run some things without export VPYTHON_BYPASS="manually managed python not supported by chrome operations" on an arm mac, such as `git cl upload` -- this CL was uploaded from my M1 MBP :) (Presubmits need py2 which we don't have yet, but with `--bypass-hooks` it works.) Bug: 1103326,1184767,1103236 Change-Id: I46f5b880dfd72b8d811d39b43311fdee17ccad3e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2858534 Commit-Queue: Dirk Pranke Auto-Submit: Nico Weber Reviewed-by: Dirk Pranke --- bootstrap/manifest.txt | 3 +-- bootstrap_python3 | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/bootstrap/manifest.txt b/bootstrap/manifest.txt index d26bde290..21669608c 100644 --- a/bootstrap/manifest.txt +++ b/bootstrap/manifest.txt @@ -21,9 +21,8 @@ $VerifiedPlatform windows-amd64 linux-amd64 mac-amd64 @Subdir python infra/3pp/tools/cpython/${os}-${arch=amd64} version:2.7.17.chromium.22 -# TODO(https://crbug.com/1103326): Remove `=amd64` once mac/arm64 python3 exists @Subdir python3 -infra/3pp/tools/cpython3/${os}-${arch=amd64} version:2@3.8.9.chromium.14 +infra/3pp/tools/cpython3/${platform} version:2@3.8.9.chromium.14 # TODO(https://crbug.com/1184766): Remove `=amd64` once mac/arm64 git exists @Subdir git diff --git a/bootstrap_python3 b/bootstrap_python3 index 341c0e52e..96110dee5 100644 --- a/bootstrap_python3 +++ b/bootstrap_python3 @@ -29,11 +29,6 @@ function bootstrap_python3 { -root "$BOOTSTRAP_PATH" BOOTSTRAP_PYTHON_BIN="${BOOTSTRAP_PATH}/python3/bin/python3" - if [[ ! -x "$BOOTSTRAP_PYTHON_BIN" && $(uname -sm) == "Darwin arm64" ]]; then - # There's no CIPD python3 package on mac/arm64. fall back to system python3. - # TODO(https://crbug.com/1103326): Remove once mac/arm64 python3 exists. - BOOTSTRAP_PYTHON_BIN=python3 - fi "$BOOTSTRAP_PYTHON_BIN" "bootstrap/bootstrap.py" --bootstrap-name "$BOOTSTRAP_PATH" cd - > /dev/null