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.
Unified · Split
| @@ -32,10 +32,14 @@ jobs: · 31 unmodified lines | |||
| 32 | CCACHE_BASEDIR: ${{ github.workspace }} | 32 | CCACHE_BASEDIR: ${{ github.workspace }} |
| 33 | CCACHE_DIR: ${{ github.workspace }}/.ccache | 33 | CCACHE_DIR: ${{ github.workspace }}/.ccache |
| 34 | CCACHE_MAXSIZE: 500M | 34 | CCACHE_MAXSIZE: 500M |
| 35 | WINE: ${{ matrix.wine }} | ||
| 35 | strategy: | 36 | strategy: |
| 36 | fail-fast: false | 37 | fail-fast: false |
| 37 | matrix: | 38 | matrix: |
| 38 | target: [i686-w64-mingw32, x86_64-w64-mingw32] | 39 | include: |
| 40 | - target: i686-w64-mingw32 | ||
| 41 | - target: x86_64-w64-mingw32 | ||
| 42 | wine: wine | ||
| 39 | steps: | 43 | steps: |
| 40 | - uses: actions/checkout@v4 | 44 | - uses: actions/checkout@v4 |
| 41 | 45 | ||
| @@ -50,11 +54,18 @@ jobs: · 8 unmodified lines | |||
| 50 | key: ${{ matrix.target }}-${{ steps.get_time.outputs.timestamp }} | 54 | key: ${{ matrix.target }}-${{ steps.get_time.outputs.timestamp }} |
| 51 | restore-keys: ${{ matrix.target }}- | 55 | restore-keys: ${{ matrix.target }}- |
| 52 | 56 | ||
| 53 | - name: Install dependencies | 57 | # For LuaJIT build |
| 58 | - name: Enable multilib | ||
| 59 | if: ${{ matrix.target == 'i686-w64-mingw32' }} | ||
| 54 | run: | | 60 | run: | |
| 55 | sudo dpkg --add-architecture i386 | 61 | sudo dpkg --add-architecture i386 |
| 56 | sudo apt-get update | 62 | sudo apt-get update |
| 57 | sudo apt-get install -y ccache g++-mingw-w64 gcc-multilib nasm ninja-build pkg-config python3-pip wine wine32 wine64 | 63 | sudo apt-get install -y gcc-multilib |
| 64 | |||
| 65 | - name: Install dependencies | ||
| 66 | run: | | ||
| 67 | sudo apt-get update | ||
| 68 | sudo apt-get install -y ccache g++-mingw-w64 nasm ninja-build pkg-config wine wine64 | ||
| 58 | sudo python3 -m pip install meson | 69 | sudo python3 -m pip install meson |
| 59 | 70 | ||
| 60 | - name: Install Meson Wraps | 71 | - name: Install Meson Wraps |
| @@ -81,12 +92,14 @@ jobs: · 20 unmodified lines | |||
| 81 | cat ./mingw_build/meson-logs/meson-log.txt | 92 | cat ./mingw_build/meson-logs/meson-log.txt |
| 82 | 93 | ||
| 83 | - name: Functional test | 94 | - name: Functional test |
| 95 | if: ${{ matrix.wine }} | ||
| 84 | run: | | 96 | run: | |
| 85 | cd artifact && wine ./mpv.com -v --no-config | 97 | cd artifact && wine ./mpv.com -v --no-config |
| 86 | env: | 98 | env: |
| 87 | WINEDEBUG: '+loaddll' | 99 | WINEDEBUG: '+loaddll' |
| 88 | 100 | ||
| 89 | - name: Run meson tests | 101 | - name: Run meson tests |
| 102 | if: ${{ matrix.wine }} | ||
| 90 | id: tests | 103 | id: tests |
| 91 | run: | | 104 | run: | |
| 92 | meson test -C mingw_build | 105 | meson test -C mingw_build |
| @@ -46,7 +46,7 @@ pkgconfig = 'pkg-config' · 45 unmodified lines | |||
| 46 | pkg-config = 'pkg-config' | 46 | pkg-config = 'pkg-config' |
| 47 | windres = '${TARGET}-windres' | 47 | windres = '${TARGET}-windres' |
| 48 | dlltool = '${TARGET}-dlltool' | 48 | dlltool = '${TARGET}-dlltool' |
| 49 | exe_wrapper = 'wine' | 49 | exe_wrapper = '${WINE}' |
| 50 | [host_machine] | 50 | [host_machine] |
| 51 | system = 'windows' | 51 | system = 'windows' |
| 52 | cpu_family = '${fam}' | 52 | cpu_family = '${fam}' |