From fe9c99e377f20555d928e676adad817ec5d2576c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 1 Apr 2025 12:36:06 +0200 Subject: [PATCH] GHA/windows: drop GnuTLS-fork from vcpkg MultiSSL job curl now has a working GnuTLS CI job, with tests, with MSYS2. The MultiSSL build scenario is now tested on macOS. The vcpkg GnuTLS package seems to have a deep dependency tree with large packages that need to be rebuilt relatively frequently. Since they can't fit into to the time limit, these cause CI failures. To stabilize CI, drop the `shiftmedia-libgnutls` dependency. Partial revert of e86f99824c4de0024cc90bca53efe205fd1c1dcc #16623 Ref: https://github.com/curl/curl/actions/runs/14192680124/job/39760753274?pr=16902 Closes #16904 --- .github/workflows/windows.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d8eb86fe84..b8a879f016 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -779,16 +779,14 @@ jobs: -DCURL_USE_GSASL=ON -DENABLE_ARES=ON -DCURL_USE_LIBUV=ON -DCURL_USE_GSSAPI=ON - name: 'schannel MultiSSL U' - # GnuTLS is not fully functional with MSVC, build-test only - # https://github.com/ShiftMediaProject/gnutls/issues/23 - install: 'brotli zlib zstd libpsl nghttp2 libssh2[core,zlib] pkgconf gsasl shiftmedia-libgnutls openssl mbedtls wolfssl' + install: 'brotli zlib zstd libpsl nghttp2 libssh2[core,zlib] pkgconf gsasl openssl mbedtls wolfssl' arch: 'x64' plat: 'windows' type: 'Debug' config: >- -DENABLE_DEBUG=ON -DCURL_USE_LIBSSH2=ON - -DCURL_USE_SCHANNEL=ON -DCURL_USE_GNUTLS=ON -DCURL_USE_OPENSSL=ON -DCURL_USE_MBEDTLS=ON -DCURL_USE_WOLFSSL=ON -DCURL_DEFAULT_SSL_BACKEND=schannel + -DCURL_USE_SCHANNEL=ON -DCURL_USE_OPENSSL=ON -DCURL_USE_MBEDTLS=ON -DCURL_USE_WOLFSSL=ON -DCURL_DEFAULT_SSL_BACKEND=schannel -DCURL_USE_GSASL=ON -DUSE_WIN32_IDN=ON -DENABLE_UNICODE=ON -DUSE_SSLS_EXPORT=ON - name: 'libressl' -- 2.47.2