Fix skipped Windows x64 build steps after windows-2022 matrix change

The matrix was switched from windows-latest to windows-2022, but the
Windows x64 ffmpeg download, electron-builder, e2e and screenshot upload
steps were still gated on matrix.os == 'windows-latest', so they never
ran and the artifact upload failed with
'File dist/LosslessCut-win-x64.7z does not exist'.

Gate them on runner.os == 'Windows' && matrix.os != 'windows-11-arm'
instead, so they are independent of the exact Windows runner image.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PWvFPqUcXUzsYf3DY7RziJ
claude/ffmpeg-path-resolution-u27mfq
Claude 2 months ago committed by Mikael Finstad
parent a2f7bc61b2
commit 7da03ebdad

@ -81,7 +81,7 @@ jobs:
yarn download-ffmpeg-darwin-arm64
- name: (Windows x64) Download ffmpeg
if: matrix.os == 'windows-latest'
if: runner.os == 'Windows' && matrix.os != 'windows-11-arm'
run: yarn download-ffmpeg-win32-x64
- name: (Windows ARM64) Download ffmpeg
@ -116,7 +116,7 @@ jobs:
GH_TOKEN: ${{ secrets.github_token }}
- name: Build for Windows x64
if: matrix.os == 'windows-latest'
if: runner.os == 'Windows' && matrix.os != 'windows-11-arm'
run: yarn electron-builder --publish onTag --win --x64
env:
GH_TOKEN: ${{ secrets.github_token }}
@ -131,7 +131,7 @@ jobs:
if: runner.os == 'macOS' && env.is_tag == 'false'
- run: node script/e2e.ts 'dist\win-unpacked\LosslessCut.exe' desktop screenshot.jpeg
if: matrix.os == 'windows-latest' && env.is_tag == 'false'
if: runner.os == 'Windows' && matrix.os != 'windows-11-arm' && env.is_tag == 'false'
- run: |
export DISPLAY=:0
@ -173,7 +173,7 @@ jobs:
yarn upload-artifacts dist/LosslessCut-win-${{ matrix.os == 'windows-11-arm' && 'arm64' || 'x64' }}.7z
- name: (Windows x64) Upload screenshot
if: matrix.os == 'windows-latest' && env.is_tag == 'false'
if: runner.os == 'Windows' && matrix.os != 'windows-11-arm' && env.is_tag == 'false'
env:
ACTIONS_RUNTIME_TOKEN: ${{ env.ACTIONS_RUNTIME_TOKEN }}
ACTIONS_RESULTS_URL: ${{ env.ACTIONS_RESULTS_URL }}

Loading…
Cancel
Save