From 2c11190b6a8cc2af918226c378133595a4cae5bb Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 13 Jun 2023 13:57:25 +0100 Subject: [PATCH 1/2] CI: Don't run windows-meson-mingw-ucrt64 by default Workaround for dbus#462: if this doesn't run reliably as a result of external factors, then we shouldn't be using it as a CI gate. Signed-off-by: Simon McVittie --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d7cb445e..3f6b5a04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -398,6 +398,8 @@ windows-meson-mingw-ucrt64: paths: - "build/config.h" - "build/meson-logs/*.txt" + # Currently broken, https://gitlab.freedesktop.org/dbus/dbus/-/issues/462 + when: manual windows-meson-vs15-x86: extends: .win-build From f8767c8e4a464e7cd14c2fd8a685b46aad149305 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 13 Jun 2023 13:59:21 +0100 Subject: [PATCH 2/2] CI: Enable "debian mingw64 meson debug" by default This gives us coverage for Meson mingw-w64 by default, but cross-compiling from Debian with MSVCRT rather than a native compilation on Windows with UCRT. When combined with "windows msys64 ucrt64 cmake", this fills in most of the missing coverage caused by disabling windows-meson-mingw-ucrt64 to work around dbus#462. Signed-off-by: Simon McVittie --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f6b5a04..7ab79757 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -262,7 +262,6 @@ debian mingw64 meson debug: extends: - .meson-common - .debian-build - when: manual variables: ci_host: "x86_64-w64-mingw32" ci_variant: "debug"