Skip to content

Commit c3da936

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 aeb12de commit c3da936

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
@@ -750,7 +750,15 @@ jobs:
750750
test-ffmpeg:
751751
if: (github.event_name != 'schedule') || (github.repository == 'mstorsjo/llvm-mingw')
752752
needs: [linux-cross-windows]
753-
runs-on: windows-latest
753+
strategy:
754+
fail-fast: false
755+
matrix:
756+
arch:
757+
- i686
758+
- x86_64
759+
- armv7
760+
- aarch64
761+
runs-on: ${{startsWith(matrix.arch, 'a') && 'windows-11-arm' || 'windows-latest'}}
754762
defaults:
755763
run:
756764
shell: msys2 {0}
@@ -771,7 +779,7 @@ jobs:
771779
nasm:p
772780
- uses: actions/download-artifact@v4
773781
with:
774-
name: windows-ucrt-x86_64-toolchain
782+
name: windows-ucrt-${{matrix.arch}}-toolchain
775783
- name: Unpack toolchain
776784
run: |
777785
unzip -q llvm-mingw-*.zip
@@ -789,7 +797,7 @@ jobs:
789797
export PATH=/llvm-mingw/bin:$PATH
790798
mkdir ffmpeg-build
791799
cd ffmpeg-build
792-
../ffmpeg/configure --samples=../fate-samples --enable-gpl
800+
../ffmpeg/configure --arch=${{matrix.arch}} --samples=../fate-samples --enable-gpl
793801
make -j$(nproc)
794802
make fate-rsync
795803
make -j$(nproc) fate

0 commit comments

Comments
 (0)