From f55a7717ecaf398e1e750848acae8f0a491d3850 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Tue, 6 Feb 2024 13:13:25 +0100 Subject: [PATCH] Add depot_tools to PATH in test --- .github/workflows/mac-build.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 7643b2b1f8f42..cb1b95ce790c3 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -50,7 +50,7 @@ jobs: run: | cd src/electron node script/yarn install - - name: Get Depot Tools + - name: Get Depot Tools run: | git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git if [ "`uname`" == "Darwin" ]; then @@ -171,7 +171,7 @@ jobs: run: | cd src/electron node script/yarn install - - name: Get Depot Tools + - name: Get Depot Tools run: | git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git if [ "`uname`" == "Darwin" ]; then @@ -460,6 +460,23 @@ jobs: run: | cd src/electron node script/yarn install + - name: Get Depot Tools + run: | + git clone --depth=1 https://chromium.googlesource.com/chromium/tools/depot_tools.git + if [ "`uname`" == "Darwin" ]; then + # remove ninjalog_uploader_wrapper.py from autoninja since we don't use it and it causes problems + sed -i '' '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja + else + sed -i '/ninjalog_uploader_wrapper.py/d' ./depot_tools/autoninja + # Remove swift-format dep from cipd on macOS until we send a patch upstream. + cd depot_tools + git apply --3way ../src/electron/.github/workflows/config/gclient.diff + fi + # Ensure depot_tools does not update. + test -d depot_tools && cd depot_tools + touch .disable_auto_update + - name: Add Depot Tools to PATH + run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH - name: Download Generated Artifacts uses: actions/download-artifact@v4 with: