diff options
| author | Christian Moritz <chrmoritz@users.noreply.github.com> | 2019-12-05 00:16:39 +0100 |
|---|---|---|
| committer | Ry Dahl <ry@tinyclouds.org> | 2019-12-04 18:16:39 -0500 |
| commit | 214b3eb29aa9cce8a55a247b4bd816cbd19bfe6b (patch) | |
| tree | a317cf1d2e6a31bf2bcc734fb675aaa4f5828a6c | |
| parent | 32937251315493ef2c3b42dd29340e8a34501aa4 (diff) | |
fix depot_tools on macOS Catalina by upgrading it to 23247b9 (#3441)
Fixes: #3440
Fixes: #3153
| -rw-r--r-- | .github/workflows/ci.yml | 8 | ||||
| m--------- | third_party | 0 | ||||
| -rw-r--r-- | tools/gclient_config.py | 2 |
3 files changed, 9 insertions, 1 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 -Subproject 8132faa910c498d4b52cb87fe7141058445a60b +Subproject 54a98143f8ba78da045cb41a5db3ef0cfb099c5 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' }, |