GHA/windows: enable wolfSSL in two MSYS2 mingw-w64 jobs

Number of tests went to 1919 (from 1912). Runs 30s faster.

Thanks-to: Christoph Reiter
Ref: 5c995ac098
Ref: #22252

Closes #22259
This commit is contained in:
Viktor Szakats 2026-07-03 22:37:58 +02:00
parent 50c244c74d
commit d054f386dd
No known key found for this signature in database

View file

@ -269,10 +269,10 @@ jobs:
build: 'autotools', sys: 'mingw64' , env: 'x86_64' , tflags: 'skiprun',
config: '--enable-debug --with-openssl --disable-threaded-resolver --enable-static --without-zlib',
install: 'mingw-w64-x86_64-openssl mingw-w64-x86_64-libssh2' }
- { name: 'c-ares U',
- { name: 'wolfssl c-ares U',
build: 'autotools', sys: 'ucrt64' , env: 'ucrt-x86_64' , tflags: '',
config: '--enable-debug --with-openssl --enable-windows-unicode --enable-ares --enable-static --disable-shared --enable-ca-native --enable-ntlm',
install: 'mingw-w64-ucrt-x86_64-c-ares mingw-w64-ucrt-x86_64-openssl mingw-w64-ucrt-x86_64-nghttp3 mingw-w64-ucrt-x86_64-libssh2' }
config: '--enable-debug --with-wolfssl --enable-windows-unicode --enable-ares --enable-static --disable-shared --enable-ca-native --enable-ntlm',
install: 'mingw-w64-ucrt-x86_64-c-ares mingw-w64-ucrt-x86_64-nghttp3 mingw-w64-ucrt-x86_64-libssh2 mingw-w64-ucrt-x86_64-wolfssl' }
- { name: 'schannel c-ares U', type: 'Debug',
build: 'cmake' , sys: 'mingw64' , env: 'x86_64' , tflags: '--min=1720',
config: '-DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_SCHANNEL=ON -DENABLE_UNICODE=ON -DENABLE_ARES=ON -DCURL_DROP_UNUSED=ON',
@ -313,8 +313,8 @@ jobs:
# install: 'mingw-w64-ucrt-x86_64-libssh2' }
- { name: 'schannel dev debug', type: 'Debug', cppflags: '-DCURL_SCHANNEL_DEV_DEBUG', image: 'windows-2025',
build: 'cmake' , sys: 'mingw64' , env: 'x86_64' , tflags: 'skiprun',
config: '-DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=ON -DCURL_USE_SCHANNEL=ON -DENABLE_UNICODE=ON -DCMAKE_VERBOSE_MAKEFILE=ON',
install: 'mingw-w64-x86_64-libssh2' }
config: '-DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=ON -DCURL_USE_SCHANNEL=ON -DCURL_USE_WOLFSSL=ON -DENABLE_UNICODE=ON -DCMAKE_VERBOSE_MAKEFILE=ON',
install: 'mingw-w64-x86_64-libssh2 mingw-w64-x86_64-wolfssl' }
- { name: 'MultiSSL R', type: 'Release',
build: 'cmake' , sys: 'mingw32' , env: 'i686' , tflags: 'skiprun',
config: '-DENABLE_DEBUG=OFF -DBUILD_SHARED_LIBS=ON -DCURL_USE_GNUTLS=ON -DCURL_USE_OPENSSL=ON -DCURL_USE_SCHANNEL=ON -DENABLE_ARES=ON -DENABLE_UNICODE=ON',
@ -341,6 +341,7 @@ jobs:
if: ${{ matrix.sys != 'msys' }}
with:
msystem: ${{ matrix.sys }}
update: ${{ contains(matrix.install, 'wolfssl') && 'true' || 'false' }}
install: >-
mingw-w64-${{ matrix.env }}-cc
mingw-w64-${{ matrix.env }}-${{ matrix.build }} ${{ matrix.build == 'autotools' && 'make' || '' }}