ci/msys2: re-enable 32-bit builds

The 32-bit builds were disabled, because some packages started disappearing. MSYS2 is slowly phasing out 32-bit support, but since we still support it we have to test it somehow. Recent brakage with calling convention mismatch would be spotted a lot quicker. So enable it, but with some, not available, packages disabled. This reverts a56d5c7
kasper93 · Jun 6, 2024 · ce36e0b · ce36e0b
1 parent cc1e469
commit ce36e0b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -500,7 +500,10 @@ jobs:
       fail-fast: false
       matrix:
         sys:
+          - clang32
           - clang64
+          - mingw32
+          - mingw64
           - mingw64
           - ucrt64
     defaults:
@@ -519,10 +522,8 @@ jobs:
           update: true
           install: git
           pacboy: >-
-            angleproject:p
             ca-certificates:p
             cc:p
-            diffutils:p
             ffmpeg:p
             lcms2:p
             libarchive:p
@@ -536,18 +537,23 @@ jobs:
             ninja:p
             pkgconf:p
             python:p
-            rst2pdf:p
-            rubberband:p
             shaderc:p
             spirv-cross:p
             uchardet:p
             vapoursynth:p
             vulkan-devel:p
 
+      - name: Install dependencies
+        if: ${{ matrix.sys != 'clang32' && matrix.sys != 'mingw32' }}
+        run: |
+          pacboy --noconfirm -S {angleproject,rst2pdf,rubberband}:p
+
       - name: Build with meson
         id: build
         run: |
           ./ci/build-msys2.sh meson
+        env:
+          SYS: ${{ matrix.sys }}
 
       - name: Print meson log
         if: ${{ failure() && steps.build.outcome == 'failure' }}

diff --git a/ci/build-msys2.sh b/ci/build-msys2.sh
@@ -7,20 +7,21 @@ meson setup build            \
   -D d3d-hwaccel=enabled     \
   -D d3d11=enabled           \
   -D dvdnav=enabled          \
-  -D egl-angle-lib=enabled   \
-  -D egl-angle-win32=enabled \
   -D jpeg=enabled            \
   -D lcms2=enabled           \
   -D libarchive=enabled      \
   -D libbluray=enabled       \
   -D libmpv=true             \
   -D lua=enabled             \
-  -D pdf-build=enabled       \
-  -D rubberband=enabled      \
   -D shaderc=enabled         \
   -D spirv-cross=enabled     \
   -D tests=true              \
   -D uchardet=enabled        \
   -D vapoursynth=enabled
+
+if [[ "$SYS" != "clang32" && "$SYS" != "mingw32" ]]; then
+   meson configure build -D{egl-angle-lib,egl-angle-win32,pdf-build,rubberband}=enabled
+fi
+
 meson compile -C build
 ./build/mpv.com -v --no-config