Skip to content

Commit

Permalink
ci/mingw: don't run test on 32-bit binary
Browse files Browse the repository at this point in the history
Ubuntu 24.04 linux-azure kernel, used on GHA, is compiled with
CONFIG_COMPAT_32BIT_TIME=no. 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: actions/runner-images#9977
  • Loading branch information
kasper93 committed Jun 6, 2024
1 parent 844565d commit 5a8fbca
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
11 changes: 8 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,14 @@ jobs:
CCACHE_BASEDIR: ${{ github.workspace }}
CCACHE_DIR: ${{ github.workspace }}/.ccache
CCACHE_MAXSIZE: 500M
WINE: ${{ matrix.wine }}
strategy:
fail-fast: false
matrix:
target: [i686-w64-mingw32, x86_64-w64-mingw32]
include:
- target: i686-w64-mingw32
- target: x86_64-w64-mingw32
wine: wine
steps:
- uses: actions/checkout@v4

Expand All @@ -52,9 +56,8 @@ jobs:

- name: Install dependencies
run: |
sudo dpkg --add-architecture i386
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 ccache g++-mingw-w64 nasm ninja-build pkg-config wine wine64
sudo python3 -m pip install meson
- name: Build libraries
Expand All @@ -76,12 +79,14 @@ jobs:
cat ./mingw_build/meson-logs/meson-log.txt
- name: Functional test
if: ${{ matrix.wine }}
run: |
cd artifact && wine ./mpv.com -v --no-config
env:
WINEDEBUG: '+loaddll'

- name: Run meson tests
if: ${{ matrix.wine }}
id: tests
run: |
meson test -C mingw_build
Expand Down
2 changes: 1 addition & 1 deletion ci/build-mingw64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pkgconfig = 'pkg-config'
pkg-config = 'pkg-config'
windres = '${TARGET}-windres'
dlltool = '${TARGET}-dlltool'
exe_wrapper = 'wine'
exe_wrapper = '${WINE}'
[host_machine]
system = 'windows'
cpu_family = '${fam}'
Expand Down

0 comments on commit 5a8fbca

Please sign in to comment.