Skip to content

Commit 52dfc93

Browse files
jeremyd2019mstorsjo
authored andcommitted
github: Run test-ffmpeg on all 4 architectures
Test both i686 and x86_64, and armv7 and aarch64 on windows-11-arm runners. Building this on arm requires passing the --host option; on x86 the default "uname -m" works for both i686 and x86_64 (ffmpeg's configure maps this to the architecture "x86", and the pointer size is tested from the compiler), but for arm architectures we need to specify them explicitly.
1 parent 6db08d6 commit 52dfc93

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

.github/workflows/build.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,15 @@ jobs:
632632
test-ffmpeg:
633633
if: (github.event_name == 'schedule') && (github.repository == 'mstorsjo/llvm-mingw')
634634
needs: [linux-cross-windows]
635-
runs-on: windows-latest
635+
strategy:
636+
fail-fast: false
637+
matrix:
638+
arch:
639+
- i686
640+
- x86_64
641+
- armv7
642+
- aarch64
643+
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
636644
defaults:
637645
run:
638646
shell: msys2 {0}
@@ -653,7 +661,7 @@ jobs:
653661
nasm:p
654662
- uses: actions/download-artifact@v4
655663
with:
656-
name: windows-ucrt-x86_64-toolchain
664+
name: windows-ucrt-${{matrix.arch}}-toolchain
657665
- name: Unpack toolchain
658666
run: |
659667
unzip -q llvm-mingw-*.zip
@@ -671,7 +679,7 @@ jobs:
671679
export PATH=/llvm-mingw/bin:$PATH
672680
mkdir ffmpeg-build
673681
cd ffmpeg-build
674-
../ffmpeg/configure --samples=../fate-samples --enable-gpl
682+
../ffmpeg/configure --arch=${{matrix.arch}} --samples=../fate-samples --enable-gpl
675683
make -j$(nproc)
676684
make fate-rsync
677685
make -j$(nproc) fate

0 commit comments

Comments
 (0)