From a2d43f4a39ec75deb66c80b11b8e585b91e8198a Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Mon, 21 Jul 2025 16:18:57 -0400 Subject: [PATCH] build: fix ffmpeg generation on Windows non-x64 (#47847) * build: fix ffmpeg generation on Windows non-x64 Co-authored-by: Shelley Vohr * test: ffmpeg artifact Co-authored-by: Shelley Vohr --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr --- .github/actions/build-electron/action.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/actions/build-electron/action.yml b/.github/actions/build-electron/action.yml index 350866638b46..50b2decbcdcf 100644 --- a/.github/actions/build-electron/action.yml +++ b/.github/actions/build-electron/action.yml @@ -38,6 +38,12 @@ runs: run: | GN_APPENDED_ARGS="$GN_EXTRA_ARGS target_cpu=\"x64\" v8_snapshot_toolchain=\"//build/toolchain/mac:clang_x64\"" echo "GN_EXTRA_ARGS=$GN_APPENDED_ARGS" >> $GITHUB_ENV + - name: Set GN_EXTRA_ARGS for Windows + shell: bash + if: ${{inputs.target-arch != 'x64' && inputs.target-platform == 'win' }} + run: | + GN_APPENDED_ARGS="$GN_EXTRA_ARGS target_cpu=\"${{ inputs.target-arch }}\"" + echo "GN_EXTRA_ARGS=$GN_APPENDED_ARGS" >> $GITHUB_ENV - name: Add Clang problem matcher shell: bash run: echo "::add-matcher::src/electron/.github/problem-matchers/clang.json" @@ -184,8 +190,8 @@ runs: electron/script/zip-symbols.py -b $BUILD_PATH fi - name: Generate FFMpeg ${{ inputs.step-suffix }} - shell: bash if: ${{ inputs.is-release == 'true' }} + shell: bash run: | cd src gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true $GN_EXTRA_ARGS"