From 51c9238c7656867458c06f068dacea0fc471f6c5 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 11 Mar 2025 01:16:11 +0100 Subject: [PATCH] GHA: enable OpenSSL QUIC in a macOS and MinGW job Closes #16665 --- .github/workflows/macos.yml | 8 ++++---- .github/workflows/windows.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 38d3508e6b..f9ce13c2d5 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -84,8 +84,8 @@ jobs: configure: --enable-debug --with-libssh --with-openssl=$(brew --prefix openssl) --enable-ares - name: 'OpenSSL libssh' compiler: llvm@15 - install: libssh - configure: --enable-debug --with-libssh --with-openssl=$(brew --prefix openssl) + install: libssh libnghttp3 + configure: --enable-debug --with-libssh --with-openssl=$(brew --prefix openssl) --with-openssl-quic - name: '!ssl c-ares' compiler: clang configure: --enable-debug --enable-ares --without-ssl @@ -381,7 +381,7 @@ jobs: # https://en.wikipedia.org/wiki/MacOS_version_history image: [macos-13, macos-14, macos-15] # Can skip these to reduce jobs: - # 15.1 has the same default macOS SDK as 15.2 and identical test result. + # 15.1 has the same default macOS SDK as 15.2 and identical test results. # 14.1, 15.4 not revealing new fallouts. #xcode: ['14.1', '14.2', '14.3.1', '15.0.1', '15.1', '15.2', '15.3', '15.4', '16.0', '16.1'] # all Xcode #xcode: ['14.1', '14.2', '14.3.1', '15.0.1' , '15.2', '15.3', '15.4', '16.0', '16.1'] # all SDK @@ -390,7 +390,7 @@ jobs: macos-version-min: [''] build: [autotools, cmake] exclude: - # Combinations uncovered by runner images: + # Combinations not covered by runner images: - { image: macos-13, xcode: '15.3' } - { image: macos-13, xcode: '15.4' } - { image: macos-13, xcode: '16.0' } diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8b19a9be52..fb3cec6f47 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -179,7 +179,7 @@ jobs: - { build: 'autotools', sys: 'msys' , env: 'x86_64' , tflags: '' , config: '--with-openssl', install: 'openssl-devel', name: 'default R' } # MinGW - { build: 'autotools', sys: 'mingw64', env: 'x86_64' , tflags: 'skiprun', config: '--enable-debug --with-openssl --disable-threaded-resolver --disable-curldebug --enable-static=no --without-zlib', install: 'mingw-w64-x86_64-openssl', name: 'default' } - - { build: 'autotools', sys: 'mingw64', env: 'x86_64' , tflags: '' , config: '--enable-debug --with-openssl --enable-windows-unicode --enable-ares', install: 'mingw-w64-x86_64-openssl', name: 'c-ares U' } + - { build: 'autotools', sys: 'mingw64', env: 'x86_64' , tflags: '' , config: '--enable-debug --with-openssl --enable-windows-unicode --enable-ares --with-openssl-quic', install: 'mingw-w64-x86_64-openssl mingw-w64-x86_64-nghttp3', name: 'c-ares U' } - { build: 'cmake' , sys: 'mingw64', env: 'x86_64' , tflags: '' , config: '-DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_SCHANNEL=ON -DENABLE_UNICODE=ON -DENABLE_ARES=ON', install: '', type: 'Debug', name: 'schannel c-ares U' } - { build: 'cmake' , sys: 'clang64', env: 'clang-x86_64', tflags: '' , config: '-DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_GNUTLS=ON -DENABLE_UNICODE=OFF -DUSE_NGTCP2=ON', install: 'mingw-w64-clang-x86_64-gnutls mingw-w64-clang-x86_64-nghttp3 mingw-w64-clang-x86_64-ngtcp2', type: 'Debug', name: 'gnutls' } - { build: 'cmake' , sys: 'ucrt64' , env: 'ucrt-x86_64' , tflags: 'skiprun', config: '-DENABLE_DEBUG=OFF -DBUILD_SHARED_LIBS=ON -DCURL_USE_SCHANNEL=ON -DENABLE_UNICODE=ON -DENABLE_CURLDEBUG=ON', install: '', type: 'Release', name: 'schannel R TrackMemory' } -- 2.47.3