Skip to content

Commit e27f554

Browse files
committed
Try using UCRT64 for Windows build
1 parent b49d404 commit e27f554

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

.github/workflows/build-ffmpeg.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@ jobs:
3232
- os: ubuntu-24.04
3333
arch: x86_64
3434
shell: bash
35-
- os: windows-latest
36-
arch: AMD64
37-
shell: 'msys2 {0}'
3835
- os: ubuntu-24.04-arm
3936
arch: aarch64
4037
shell: bash
38+
- os: windows-latest
39+
arch: AMD64
40+
shell: 'msys2 {0}'
41+
msys_sys: ucrt64
42+
msys_env: ucrt-x86_64
4143
defaults:
4244
run:
4345
shell: ${{ matrix.shell }}
@@ -54,12 +56,13 @@ jobs:
5456
run: |
5557
brew update
5658
brew unlink gettext libidn2 libpng libtiff libunistring libx11 libxau libxcb libxdmcp little-cms2 unbound
57-
- uses: msys2/setup-msys2@c52d1fa9c7492275e60fe763540fb601f5f232a1
59+
- uses: msys2/setup-msys2@v2
5860
if: matrix.os == 'windows-latest'
5961
with:
60-
install: base-devel mingw-w64-x86_64-gcc mingw-w64-x86_64-gperf mingw-w64-x86_64-nasm openssl-devel
62+
install: base-devel mingw-${{ matrix.msys_env }}-cc mingw-${{ matrix.msys_env }}-gperf mingw-${{ matrix.msys_env }}-nasm openssl-devel
6163
path-type: inherit
6264
release: false
65+
system: ${{ matrix.msys_sys }}
6366
- name: Build FFmpeg
6467
env:
6568
CIBW_ARCHS: ${{ matrix.arch }}

0 commit comments

Comments
 (0)