ci/mingw: don't run test on 32-bit binary

Ubuntu 24.04 linux-azure kernel, used on GHA, is compiled with
CONFIG_COMPAT_32BIT_TIME=n. This prevents running any 32-bit binaries
through wine, so disable tests when doing i686 build. 32-bit builds are
still tested on Windows.

See: https://github.com/actions/runner-images/issues/9977
This commit is contained in:
Kacper Michajłow 2024-06-06 23:23:35 +02:00
parent dea176a7bf
commit f47cbcd439
2 changed files with 17 additions and 4 deletions

View File

@ -32,10 +32,14 @@ jobs:
CCACHE_BASEDIR: ${{ github.workspace }} CCACHE_BASEDIR: ${{ github.workspace }}
CCACHE_DIR: ${{ github.workspace }}/.ccache CCACHE_DIR: ${{ github.workspace }}/.ccache
CCACHE_MAXSIZE: 500M CCACHE_MAXSIZE: 500M
WINE: ${{ matrix.wine }}
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
target: [i686-w64-mingw32, x86_64-w64-mingw32] include:
- target: i686-w64-mingw32
- target: x86_64-w64-mingw32
wine: wine
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -50,11 +54,18 @@ jobs:
key: ${{ matrix.target }}-${{ steps.get_time.outputs.timestamp }} key: ${{ matrix.target }}-${{ steps.get_time.outputs.timestamp }}
restore-keys: ${{ matrix.target }}- restore-keys: ${{ matrix.target }}-
- name: Install dependencies # For LuaJIT build
- name: Enable multilib
if: ${{ matrix.target == 'i686-w64-mingw32' }}
run: | run: |
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt-get update sudo apt-get update
sudo apt-get install -y ccache g++-mingw-w64 gcc-multilib nasm ninja-build pkg-config python3-pip wine wine32 wine64 sudo apt-get install -y gcc-multilib
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y ccache g++-mingw-w64 nasm ninja-build pkg-config wine wine64
sudo python3 -m pip install meson sudo python3 -m pip install meson
- name: Install Meson Wraps - name: Install Meson Wraps
@ -81,12 +92,14 @@ jobs:
cat ./mingw_build/meson-logs/meson-log.txt cat ./mingw_build/meson-logs/meson-log.txt
- name: Functional test - name: Functional test
if: ${{ matrix.wine }}
run: | run: |
cd artifact && wine ./mpv.com -v --no-config cd artifact && wine ./mpv.com -v --no-config
env: env:
WINEDEBUG: '+loaddll' WINEDEBUG: '+loaddll'
- name: Run meson tests - name: Run meson tests
if: ${{ matrix.wine }}
id: tests id: tests
run: | run: |
meson test -C mingw_build meson test -C mingw_build

View File

@ -46,7 +46,7 @@ pkgconfig = 'pkg-config'
pkg-config = 'pkg-config' pkg-config = 'pkg-config'
windres = '${TARGET}-windres' windres = '${TARGET}-windres'
dlltool = '${TARGET}-dlltool' dlltool = '${TARGET}-dlltool'
exe_wrapper = 'wine' exe_wrapper = '${WINE}'
[host_machine] [host_machine]
system = 'windows' system = 'windows'
cpu_family = '${fam}' cpu_family = '${fam}'