Skip to content

Commit ea17e83

Browse files
build: fix ffmpeg generation on Windows non-x64 (#47845)
* build: fix ffmpeg generation on Windows non-x64 Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> * test: ffmpeg artifact Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
1 parent 7b5d411 commit ea17e83

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

.github/actions/build-electron/action.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ runs:
3838
run: |
3939
GN_APPENDED_ARGS="$GN_EXTRA_ARGS target_cpu=\"x64\" v8_snapshot_toolchain=\"//build/toolchain/mac:clang_x64\""
4040
echo "GN_EXTRA_ARGS=$GN_APPENDED_ARGS" >> $GITHUB_ENV
41+
- name: Set GN_EXTRA_ARGS for Windows
42+
shell: bash
43+
if: ${{inputs.target-arch != 'x64' && inputs.target-platform == 'win' }}
44+
run: |
45+
GN_APPENDED_ARGS="$GN_EXTRA_ARGS target_cpu=\"${{ inputs.target-arch }}\""
46+
echo "GN_EXTRA_ARGS=$GN_APPENDED_ARGS" >> $GITHUB_ENV
4147
- name: Add Clang problem matcher
4248
shell: bash
4349
run: echo "::add-matcher::src/electron/.github/problem-matchers/clang.json"
@@ -184,8 +190,8 @@ runs:
184190
electron/script/zip-symbols.py -b $BUILD_PATH
185191
fi
186192
- name: Generate FFMpeg ${{ inputs.step-suffix }}
187-
shell: bash
188193
if: ${{ inputs.is-release == 'true' }}
194+
shell: bash
189195
run: |
190196
cd src
191197
gn gen out/ffmpeg --args="import(\"//electron/build/args/ffmpeg.gn\") use_remoteexec=true $GN_EXTRA_ARGS"

0 commit comments

Comments
 (0)