]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
CI: Force use of subprojects for Windows 32-bit build
authorSimon McVittie <smcv@collabora.com>
Mon, 27 Jun 2022 10:20:56 +0000 (11:20 +0100)
committerSimon McVittie <smcv@collabora.com>
Wed, 13 Jul 2022 19:36:13 +0000 (20:36 +0100)
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>
.gitlab-ci.yml

index 6819f9c7a9ff5bd41ed4a465ffc21780c9322c2f..b3f0e22e1f470238f15e9f930beaa31a1a8299c4 100644 (file)
@@ -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: