Skip to content

Commit f3ead6e

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 7bc6345 commit f3ead6e

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
@@ -627,7 +627,15 @@ jobs:
627627
test-ffmpeg:
628628
if: (github.event_name == 'schedule') && (github.repository == 'mstorsjo/llvm-mingw')
629629
needs: [linux-cross-windows]
630-
runs-on: windows-latest
630+
strategy:
631+
fail-fast: false
632+
matrix:
633+
arch:
634+
- i686
635+
- x86_64
636+
- armv7
637+
- aarch64
638+
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
631639
defaults:
632640
run:
633641
shell: msys2 {0}
@@ -648,7 +656,7 @@ jobs:
648656
nasm:p
649657
- uses: actions/download-artifact@v4
650658
with:
651-
name: windows-ucrt-x86_64-toolchain
659+
name: windows-ucrt-${{matrix.arch}}-toolchain
652660
- name: Unpack toolchain
653661
run: |
654662
unzip -q llvm-mingw-*.zip
@@ -666,7 +674,7 @@ jobs:
666674
export PATH=/llvm-mingw/bin:$PATH
667675
mkdir ffmpeg-build
668676
cd ffmpeg-build
669-
../ffmpeg/configure --samples=../fate-samples --enable-gpl
677+
../ffmpeg/configure --arch=${{matrix.arch}} --samples=../fate-samples --enable-gpl
670678
make -j$(nproc)
671679
make fate-rsync
672680
make -j$(nproc) fate

0 commit comments

Comments
 (0)