From 4f98f354b12a1a0524af1ef1df8371fe99b32677 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 26 Feb 2025 15:48:35 +0100 Subject: [PATCH] GHA/windows: move UWP vcpkg job up top To bring it closer to WinCE and make the vcpkg jobs with tests form a continuous group. Closes #16499 --- .github/workflows/windows.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 60f0fb2965..991935c753 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -703,16 +703,16 @@ jobs: strategy: matrix: include: - - name: 'schannel MultiSSL U' - install: 'brotli zlib zstd libpsl nghttp2 libssh2[core,zlib] pkgconf gsasl openssl mbedtls wolfssl' + - name: 'openssl' + install: 'brotli zlib zstd nghttp2 nghttp3 openssl libssh2' arch: 'x64' - plat: 'windows' + plat: 'uwp' type: 'Debug' - tflags: '~1516 ~2301 ~2302 ~2303 ~2307 ~2310' + tflags: 'skiprun' config: >- -DCURL_USE_LIBSSH2=ON - -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 + -DCURL_USE_SCHANNEL=OFF -DCURL_USE_OPENSSL=ON -DUSE_OPENSSL_QUIC=ON + -DCURL_USE_LIBPSL=OFF - name: 'openssl' install: 'brotli zlib zstd libpsl nghttp2 nghttp3 openssl libssh2 pkgconf gsasl c-ares libuv krb5' @@ -725,16 +725,16 @@ jobs: -DCURL_USE_SCHANNEL=OFF -DCURL_USE_OPENSSL=ON -DUSE_OPENSSL_QUIC=ON -DCURL_USE_GSASL=ON -DENABLE_ARES=ON -DCURL_USE_LIBUV=ON -DCURL_USE_GSSAPI=ON - - name: 'openssl' - install: 'brotli zlib zstd nghttp2 nghttp3 openssl libssh2' + - name: 'schannel MultiSSL U' + install: 'brotli zlib zstd libpsl nghttp2 libssh2[core,zlib] pkgconf gsasl openssl mbedtls wolfssl' arch: 'x64' - plat: 'uwp' + plat: 'windows' type: 'Debug' - tflags: 'skiprun' + tflags: '~1516 ~2301 ~2302 ~2303 ~2307 ~2310' config: >- -DCURL_USE_LIBSSH2=ON - -DCURL_USE_SCHANNEL=OFF -DCURL_USE_OPENSSL=ON -DUSE_OPENSSL_QUIC=ON - -DCURL_USE_LIBPSL=OFF + -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' install: 'brotli zlib zstd libpsl nghttp2 libressl libssh2[core,zlib] pkgconf ngtcp2[libressl] nghttp3'