From 214b3eb29aa9cce8a55a247b4bd816cbd19bfe6b Mon Sep 17 00:00:00 2001 From: Christian Moritz Date: Thu, 5 Dec 2019 00:16:39 +0100 Subject: fix depot_tools on macOS Catalina by upgrading it to 23247b9 (#3441) Fixes: #3440 Fixes: #3153 --- .github/workflows/ci.yml | 8 ++++++++ third_party | 2 +- tools/gclient_config.py | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bbdf02d57..71a631153 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -59,6 +59,14 @@ jobs: python-version: "2.7.16" architecture: x64 + - name: Remove unused versions of Python + if: startsWith(matrix.os, 'windows') + run: |- + $env:PATH -split ";" | + Where-Object { Test-Path "$_\python.exe" } | + Select-Object -Skip 1 | + ForEach-Object { Move-Item "$_" "$_.disabled" } + - name: Environment (common) run: | echo ::set-env name=GH_ACTIONS::1 diff --git a/third_party b/third_party index 8132faa91..54a98143f 160000 --- a/third_party +++ b/third_party @@ -1 +1 @@ -Subproject commit 8132faa910c498d4b52cb87fe7141058445a60b3 +Subproject commit 54a98143f8ba78da045cb41a5db3ef0cfb099c5d diff --git a/tools/gclient_config.py b/tools/gclient_config.py index e100e9947..bfabaee1e 100644 --- a/tools/gclient_config.py +++ b/tools/gclient_config.py @@ -26,7 +26,7 @@ solutions = [ }, { 'url': - 'https://chromium.googlesource.com/chromium/tools/depot_tools@efce0d1b7657c440c90f0f4bce614b96672b9e0b', + 'https://chromium.googlesource.com/chromium/tools/depot_tools@23247b99321549c24e62ad45200409419423695d', 'name': 'depot_tools' }, -- cgit v1.2.3