From 7b777f949a03cfb181632c4dd1e034966847a5bf Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Mon, 15 Jul 2024 12:40:07 -0400 Subject: [PATCH] build: update build-tools for GHA (#42874) * chore: update build-tools for GHA Co-authored-by: John Kleinschmidt * build: fixup GHA running on fork PRs (#42880) * chore: update build-tools for GHA * chore: don't rely on environment variables for source cache location --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt --- .github/actions/install-build-tools/action.yml | 2 +- .github/actions/restore-cache-azcopy/action.yml | 3 +++ .github/workflows/pipeline-segment-electron-build.yml | 2 -- .github/workflows/pipeline-segment-electron-gn-check.yml | 2 -- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/actions/install-build-tools/action.yml b/.github/actions/install-build-tools/action.yml index cc2050f53252..67d741b02f68 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=ff3e40a9a2ebb735c18b6450ecd5ddaa8bb364a9 + export BUILD_TOOLS_SHA=d5b87591842be19058e8d75d2c5b7f1fabe9f450 npm i -g @electron/build-tools e auto-update disable \ No newline at end of file diff --git a/.github/actions/restore-cache-azcopy/action.yml b/.github/actions/restore-cache-azcopy/action.yml index 0d23a5f8c6da..d41014b7556c 100644 --- a/.github/actions/restore-cache-azcopy/action.yml +++ b/.github/actions/restore-cache-azcopy/action.yml @@ -34,6 +34,9 @@ runs: fi azcopy copy --log-level=ERROR \ "https://${{ env.AZURE_AKS_CACHE_STORAGE_ACCOUNT }}.file.core.windows.net/${{ env.AZURE_AKS_CACHE_SHARE_NAME }}/${{ env.CACHE_PATH }}?$sas_token" $DEPSHASH.tar + env: + AZURE_AKS_CACHE_STORAGE_ACCOUNT: f723719aa87a34622b5f7f3 + AZURE_AKS_CACHE_SHARE_NAME: pvc-f6a4089f-b082-4bee-a3f9-c3e1c0c02d8f - name: Clean SAS Key shell: bash run: rm -f sas-token diff --git a/.github/workflows/pipeline-segment-electron-build.yml b/.github/workflows/pipeline-segment-electron-build.yml index 1b3279ab7657..65ff9e6f6695 100644 --- a/.github/workflows/pipeline-segment-electron-build.yml +++ b/.github/workflows/pipeline-segment-electron-build.yml @@ -61,8 +61,6 @@ concurrency: cancel-in-progress: ${{ github.ref != 'refs/heads/main' && !endsWith(github.ref, '-x-y') }} env: - AZURE_AKS_CACHE_STORAGE_ACCOUNT: ${{ secrets.AZURE_AKS_CACHE_STORAGE_ACCOUNT }} - AZURE_AKS_CACHE_SHARE_NAME: ${{ secrets.AZURE_AKS_CACHE_SHARE_NAME }} ELECTRON_ARTIFACTS_BLOB_STORAGE: ${{ secrets.ELECTRON_ARTIFACTS_BLOB_STORAGE }} ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }} ELECTRON_GITHUB_TOKEN: ${{ secrets.ELECTRON_GITHUB_TOKEN }} diff --git a/.github/workflows/pipeline-segment-electron-gn-check.yml b/.github/workflows/pipeline-segment-electron-gn-check.yml index 101a9656670f..ecd6ea57253b 100644 --- a/.github/workflows/pipeline-segment-electron-gn-check.yml +++ b/.github/workflows/pipeline-segment-electron-gn-check.yml @@ -36,8 +36,6 @@ concurrency: cancel-in-progress: true env: - AZURE_AKS_CACHE_STORAGE_ACCOUNT: ${{ secrets.AZURE_AKS_CACHE_STORAGE_ACCOUNT }} - AZURE_AKS_CACHE_SHARE_NAME: ${{ secrets.AZURE_AKS_CACHE_SHARE_NAME }} ELECTRON_RBE_JWT: ${{ secrets.ELECTRON_RBE_JWT }} GCLIENT_EXTRA_ARGS: ${{ inputs.target-platform == 'macos' && '--custom-var=checkout_mac=True --custom-var=host_os=mac' || '--custom-var=checkout_arm=True --custom-var=checkout_arm64=True' }} ELECTRON_OUT_DIR: Default