From: Simon McVittie <smcv@collabora.com>
Date: Mon, 27 Jun 2022 10:20:56 +0000 (+0100)
Subject: CI: Force use of subprojects for Windows 32-bit build
X-Git-Tag: dbus-1.15.0~32^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e617c4d5c8a0d7d21d510b0d7da6b2708eb7559;p=thirdparty%2Fdbus.git

CI: Force use of subprojects for Windows 32-bit build

The Windows image has expat and zlib installed, but they're 64-bit DLLs
which won't link successfully into our 32-bit build.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6819f9c7a..b3f0e22e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -353,7 +353,7 @@ windows-meson-vs15-x86:
   extends: .win-build
   script:
     - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=x86 &&
-        meson build &&
+        meson --force-fallback-for=expat,glib,zlib build &&
         meson test -C build"
 
 # vim:set sw=2 sts=2 et: