diff options
| author | Simon McVittie <smcv@collabora.com> | 2022-06-27 11:20:56 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2022-07-13 20:36:13 +0100 |
| commit | 3e617c4d5c8a0d7d21d510b0d7da6b2708eb7559 (patch) | |
| tree | 14833ca6905749c10508709da14ea7a902527786 /.gitlab-ci.yml | |
| parent | b2a143aa7e3b50dfafea978021d866dd4d26d707 (diff) | |
| download | dbus-3e617c4d5c8a0d7d21d510b0d7da6b2708eb7559.tar.gz | |
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>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6819f9c7..b3f0e22e 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: |