From 7d2c27c83e45908efba7e469d024e6bb0bbf7a6d Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Mon, 24 Mar 2025 17:22:50 -0400 Subject: [PATCH] build: fixup release builds (#46233) * build: fixup release builds Co-authored-by: John Kleinschmidt * build: fixup windows source cache for release --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt --- .github/actions/build-electron/action.yml | 2 +- .github/workflows/macos-publish.yml | 1 + .github/workflows/windows-publish.yml | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/actions/build-electron/action.yml b/.github/actions/build-electron/action.yml index 58a416e01f..710c0b8ac5 100644 --- a/.github/actions/build-electron/action.yml +++ b/.github/actions/build-electron/action.yml @@ -185,7 +185,7 @@ runs: if: ${{ inputs.is-release == 'true' }} run: | cd src - gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true $GN_EXTRA_ARGS" + e d gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true $GN_EXTRA_ARGS" e build --target electron:electron_ffmpeg_zip -C ../../out/ffmpeg -j $NUMBER_OF_NINJA_PROCESSES - name: Generate Hunspell Dictionaries ${{ inputs.step-suffix }} shell: bash diff --git a/.github/workflows/macos-publish.yml b/.github/workflows/macos-publish.yml index 34baead94a..95673bde17 100644 --- a/.github/workflows/macos-publish.yml +++ b/.github/workflows/macos-publish.yml @@ -39,6 +39,7 @@ jobs: uses: ./src/electron/.github/actions/checkout with: generate-sas-token: 'true' + target-platform: macos publish-x64-darwin: uses: ./.github/workflows/pipeline-segment-electron-build.yml diff --git a/.github/workflows/windows-publish.yml b/.github/workflows/windows-publish.yml index 1ee5845eaf..0f4ee59152 100644 --- a/.github/workflows/windows-publish.yml +++ b/.github/workflows/windows-publish.yml @@ -25,7 +25,8 @@ jobs: image: ghcr.io/electron/build:${{ inputs.build-image-sha }} options: --user root --device /dev/fuse --cap-add SYS_ADMIN volumes: - - /mnt/cross-instance-cache:/mnt/cross-instance-cache + - /mnt/win-cache:/mnt/win-cache + - /var/run/sas:/var/run/sas env: GCLIENT_EXTRA_ARGS: '--custom-var=checkout_win=True' TARGET_OS: 'win' @@ -40,6 +41,9 @@ jobs: fetch-depth: 0 - name: Checkout & Sync & Save uses: ./src/electron/.github/actions/checkout + with: + generate-sas-token: 'true' + target-platform: win publish-x64-win: uses: ./.github/workflows/pipeline-segment-electron-build.yml