On 28/7/23 16:27, Thomas Huth wrote:
We are struggeling with timeouts in the 64-bit MSYS2 job. Clang seems to be a little bit faster, so let's use this compiler now instead.There is a problem with compiling the spice headers with Clang, though, so we can only test this in the 32-bit builds with GCC now. And we have to disable dbus-display - otherwise the compilation aborts in the CI. Signed-off-by: Thomas Huth <th...@redhat.com> --- .gitlab-ci.d/windows.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index f086540e40..ff9e9af4bb 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -43,7 +43,6 @@ $MINGW_TARGET-curl $MINGW_TARGET-cyrus-sasl $MINGW_TARGET-dtc - $MINGW_TARGET-gcc $MINGW_TARGET-glib2 $MINGW_TARGET-gnutls $MINGW_TARGET-gtk3 @@ -63,9 +62,9 @@ $MINGW_TARGET-SDL2 $MINGW_TARGET-SDL2_image $MINGW_TARGET-snappy - $MINGW_TARGET-spice $MINGW_TARGET-usbredir - $MINGW_TARGET-zstd " + $MINGW_TARGET-zstd + $EXTRA_PACKAGES " - $env:CHERE_INVOKING = 'yes' # Preserve the current working directory - $env:MSYS = 'winsymlinks:native' # Enable native Windows symlink - mkdir build @@ -77,13 +76,15 @@ msys2-64bit: extends: .shared_msys2_builder variables: - MINGW_TARGET: mingw-w64-x86_64 - MSYSTEM: MINGW64 + MINGW_TARGET: mingw-w64-clang-x86_64 + MSYSTEM: CLANG64
OK to use Clang, but I'm tempted to keep the GCC job in manual mode...
