From 9a087b9c569041cbcfb1068749a28ac1336029c3 Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Fri, 18 Oct 2024 09:39:59 -0400 Subject: [PATCH] chore: fixup reclient read only access on forks (#44304) chore: fixup reclient read only access on forks (#44280) --- .github/actions/install-build-tools/action.yml | 2 +- .../workflows/pipeline-segment-electron-build.yml | 13 ++----------- .../pipeline-segment-electron-gn-check.yml | 2 +- appveyor-woa.yml | 4 +--- appveyor.yml | 4 +--- 5 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.github/actions/install-build-tools/action.yml b/.github/actions/install-build-tools/action.yml index 0f274ad79dbc..79628bf68367 100644 --- a/.github/actions/install-build-tools/action.yml +++ b/.github/actions/install-build-tools/action.yml @@ -6,6 +6,6 @@ runs: - name: Install Build Tools shell: bash run: | - export BUILD_TOOLS_SHA=d5b87591842be19058e8d75d2c5b7f1fabe9f450 + export BUILD_TOOLS_SHA=eeb1a11392e4cec08fd926c93b31ab556dc0c23b npm i -g @electron/build-tools e auto-update disable diff --git a/.github/workflows/pipeline-segment-electron-build.yml b/.github/workflows/pipeline-segment-electron-build.yml index c7636a3d10c6..3589262975f7 100644 --- a/.github/workflows/pipeline-segment-electron-build.yml +++ b/.github/workflows/pipeline-segment-electron-build.yml @@ -164,7 +164,7 @@ jobs: uses: ./src/electron/.github/actions/install-build-tools - name: Init Build Tools run: | - e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }} --only-sdk + e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }} - name: Run Electron Only Hooks run: | gclient runhooks --spec="solutions=[{'name':'src/electron','url':None,'deps_file':'DEPS','custom_vars':{'process_deps':False},'managed':False}]" @@ -177,18 +177,9 @@ jobs: - name: Fix Sync (macOS) if: ${{ inputs.target-platform == 'macos' }} uses: ./src/electron/.github/actions/fix-sync-macos - - name: Install build-tools & Setup RBE + - name: Setup Number of Ninja Processes run: | echo "NUMBER_OF_NINJA_PROCESSES=${{ inputs.target-platform == 'linux' && '300' || '200' }}" >> $GITHUB_ENV - cd ~/.electron_build_tools - npx yarn --ignore-engines - # Pull down credential helper and print status - node -e "require('./src/utils/reclient.js').downloadAndPrepare({})" - HELPER=$(node -p "require('./src/utils/reclient.js').helperPath({})") - $HELPER login - echo 'RBE_service='`node -e "console.log(require('./src/utils/reclient.js').serviceAddress)"` >> $GITHUB_ENV - echo 'RBE_experimental_credentials_helper='`node -e "console.log(require('./src/utils/reclient.js').helperPath({}))"` >> $GITHUB_ENV - echo 'RBE_experimental_credentials_helper_args=print' >> $GITHUB_ENV - name: Free up space (macOS) if: ${{ inputs.target-platform == 'macos' }} uses: ./src/electron/.github/actions/free-space-macos diff --git a/.github/workflows/pipeline-segment-electron-gn-check.yml b/.github/workflows/pipeline-segment-electron-gn-check.yml index f58ea48236f1..f70a137f2ce7 100644 --- a/.github/workflows/pipeline-segment-electron-gn-check.yml +++ b/.github/workflows/pipeline-segment-electron-gn-check.yml @@ -75,7 +75,7 @@ jobs: uses: ./src/electron/.github/actions/install-build-tools - name: Init Build Tools run: | - e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }} --only-sdk + e init -f --root=$(pwd) --out=Default ${{ inputs.gn-build-type }} --import ${{ inputs.gn-build-type }} --target-cpu ${{ inputs.target-arch }} - name: Get Depot Tools timeout-minutes: 5 run: | diff --git a/appveyor-woa.yml b/appveyor-woa.yml index 771d56f3fee1..3c78f5751c5b 100644 --- a/appveyor-woa.yml +++ b/appveyor-woa.yml @@ -128,8 +128,6 @@ for: if ($env:ELECTRON_RBE_JWT -eq '') { $env:RBE_fail_early_min_action_count = "0" $env:RBE_fail_early_min_fallback_ratio = "0" - $env:RBE_exec_strategy = "local" - $env:RBE_remote_update_cache= "false" } - cd ..\.. - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools" @@ -158,7 +156,7 @@ for: - gn check out/Default //electron:electron_app - gn check out/Default //electron/shell/common:mojo - gn check out/Default //electron/shell/common:plugin - - if DEFINED ELECTRON_RBE_JWT (autoninja -j 300 -C out/Default electron:electron_app) else (autoninja -C out/Default electron:electron_app) + - autoninja -j 300 -C out/Default electron:electron_app - if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default ) - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true %GN_EXTRA_ARGS%" - autoninja -C out/ffmpeg electron:electron_ffmpeg_zip diff --git a/appveyor.yml b/appveyor.yml index d97b9577e9b5..6461e86f12dc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -123,8 +123,6 @@ for: if ($env:ELECTRON_RBE_JWT -eq '') { $env:RBE_fail_early_min_action_count = "0" $env:RBE_fail_early_min_fallback_ratio = "0" - $env:RBE_exec_strategy = "local" - $env:RBE_remote_update_cache= "false" } - cd ..\.. - ps: $env:CHROMIUM_BUILDTOOLS_PATH="$pwd\src\buildtools" @@ -153,7 +151,7 @@ for: - gn check out/Default //electron:electron_app - gn check out/Default //electron/shell/common:mojo - gn check out/Default //electron/shell/common:plugin - - if DEFINED ELECTRON_RBE_JWT (autoninja -j 300 -C out/Default electron:electron_app) else (autoninja -C out/Default electron:electron_app) + - autoninja -j 300 -C out/Default electron:electron_app - if "%GN_CONFIG%"=="testing" ( python C:\depot_tools\post_build_ninja_summary.py -C out\Default ) - gn gen out/ffmpeg "--args=import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true %GN_EXTRA_ARGS%" - autoninja -C out/ffmpeg electron:electron_ffmpeg_zip