From e052bbcd57594be7c8ab4a0119fc8f19efc4df1b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 15 Apr 2021 09:21:40 +0200 Subject: ci: adapt to configure requiring an explicit TLS choice --- .azure-pipelines.yml | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) (limited to '.azure-pipelines.yml') diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 8f7288854..2f6276be7 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -58,23 +58,23 @@ stages: default: name: default install: jsonlint - configure: --enable-debug + configure: --enable-debug --with-openssl disable_ipv6: name: w/o IPv6 - configure: --disable-ipv6 + configure: --disable-ipv6 --with-openssl disable_http_smtp_imap: name: w/o HTTP/SMTP/IMAP - configure: --disable-http --disable-smtp --disable-imap + configure: --disable-http --disable-smtp --disable-imap --without-openssl disable_thredres: name: sync resolver - configure: --disable-threaded-resolver - http_only: - name: HTTP only - configure: --disable-dict --disable-file --disable-ftp --disable-gopher --disable-imap --disable-ldap --disable-pop3 --disable-rtmp --disable-rtsp --disable-scp --disable-sftp --disable-smb --disable-smtp --disable-telnet --disable-tftp + configure: --disable-threaded-resolver --with-openssl + https_only: + name: HTTPS only + configure: --disable-dict --disable-file --disable-ftp --disable-gopher --disable-imap --disable-ldap --disable-pop3 --disable-rtmp --disable-rtsp --disable-scp --disable-sftp --disable-smb --disable-smtp --disable-telnet --disable-tftp --with-openssl torture: name: torture install: libnghttp2-dev - configure: --enable-debug --disable-shared --disable-threaded-resolver + configure: --enable-debug --disable-shared --disable-threaded-resolver --with-openssl tests: -n -t --shallow=40 !FTP steps: - script: sudo apt-get update && sudo apt-get install -y stunnel4 python3-impacket libzstd-dev libbrotli-dev $(install) @@ -114,68 +114,68 @@ stages: strategy: matrix: msys2_mingw32_debug_openssl: - name: 32-bit OpenSSL and MQTT + name: 32-bit OpenSSL container_img: mback2k/curl-docker-winbuildenv-msys2-mingw32:ltsc2019 container_cmd: C:\msys64\usr\bin\sh prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2 - configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --with-libssh2 + configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --with-libssh2 --with-openssl tests: ~571 ~612 ~1056 ~1299 !SCP msys2_mingw64_debug_openssl: - name: 64-bit OpenSSL and MQTT + name: 64-bit OpenSSL container_img: mback2k/curl-docker-winbuildenv-msys2-mingw64:ltsc2019 container_cmd: C:\msys64\usr\bin\sh prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2 - configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --with-libssh2 + configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --with-libssh2 --with-openssl tests: ~571 ~612 ~1056 ~1299 !SCP - msys1_mingw_debug_openssl: - name: 32-bit OpenSSL (legacy) + msys1_mingw_debug: + name: 32-bit (legacy) container_img: mback2k/curl-docker-winbuildenv-msys1-mingw:ltsc2019 container_cmd: C:\MinGW\msys\1.0\bin\sh - configure: --host=i686-pc-mingw32 --build=i686-pc-mingw32 --prefix=/mingw --enable-debug + configure: --host=i686-pc-mingw32 --build=i686-pc-mingw32 --prefix=/mingw --enable-debug --without-ssl tests: ~203 ~1056 ~1143 - msys1_mingw32_debug_openssl: - name: 32-bit OpenSSL w/o zlib + msys1_mingw32_debug: + name: 32-bit w/o zlib container_img: mback2k/curl-docker-winbuildenv-msys1-mingw32:ltsc2019 container_cmd: C:\MinGW\msys\1.0\bin\sh - configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --without-zlib + configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --without-zlib --without-ssl tests: ~203 ~1056 ~1143 ~1299 - msys1_mingw64_debug_openssl: - name: 64-bit OpenSSL w/o zlib + msys1_mingw64_debug: + name: 64-bit w/o zlib container_img: mback2k/curl-docker-winbuildenv-msys1-mingw64:ltsc2019 container_cmd: C:\MinGW\msys\1.0\bin\sh - configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --without-zlib + configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --without-zlib --without-ssl tests: ~203 ~1056 ~1143 ~1299 msys2_mingw32_debug_schannel: name: 32-bit Schannel/SSPI/WinIDN container_img: mback2k/curl-docker-winbuildenv-msys2-mingw32:ltsc2019 container_cmd: C:\msys64\usr\bin\sh prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-i686-libssh2 - configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn --with-libssh2 + configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 tests: ~165 ~310 ~571 ~612 ~1056 ~1299 ~1448 ~2034 ~2037 ~2041 ~2046 ~2047 ~3000 ~3001 !SCP msys2_mingw64_debug_schannel: name: 64-bit Schannel/SSPI/WinIDN container_img: mback2k/curl-docker-winbuildenv-msys2-mingw64:ltsc2019 container_cmd: C:\msys64\usr\bin\sh prepare: pacman -S --needed --noconfirm --noprogressbar libssh2-devel mingw-w64-x86_64-libssh2 - configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn --with-libssh2 + configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --with-libssh2 tests: ~165 ~310 ~571 ~612 ~1056 ~1299 ~1448 ~2034 ~2037 ~2041 ~2046 ~2047 ~3000 ~3001 !SCP msys1_mingw_debug_schannel: name: 32-bit Schannel/SSPI/WinIDN (legacy) container_img: mback2k/curl-docker-winbuildenv-msys1-mingw:ltsc2019 container_cmd: C:\MinGW\msys\1.0\bin\sh - configure: --host=i686-pc-mingw32 --build=i686-pc-mingw32 --prefix=/mingw --enable-debug --enable-sspi --without-ssl --with-schannel --with-winidn + configure: --host=i686-pc-mingw32 --build=i686-pc-mingw32 --prefix=/mingw --enable-debug --enable-sspi --with-schannel --with-winidn tests: ~203 ~305 ~310 ~311 ~312 ~313 ~404 ~1056 ~1143 ~2034 ~2035 ~2037 ~2038 ~2041 ~2042 ~2048 ~3000 ~3001 msys1_mingw32_debug_schannel: name: 32-bit Schannel/SSPI/WinIDN w/o zlib container_img: mback2k/curl-docker-winbuildenv-msys1-mingw32:ltsc2019 container_cmd: C:\MinGW\msys\1.0\bin\sh - configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn --without-zlib + configure: --host=i686-w64-mingw32 --build=i686-w64-mingw32 --prefix=/mingw32 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --without-zlib tests: ~203 ~310 ~1056 ~1143 ~1299 ~2034 ~2037 ~2041 ~3000 ~3001 msys1_mingw64_debug_schannel: name: 64-bit Schannel/SSPI/WinIDN w/o zlib container_img: mback2k/curl-docker-winbuildenv-msys1-mingw64:ltsc2019 container_cmd: C:\MinGW\msys\1.0\bin\sh - configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-sspi --without-ssl --with-schannel --with-winidn --without-zlib + configure: --host=x86_64-w64-mingw32 --build=x86_64-w64-mingw32 --prefix=/mingw64 --enable-debug --enable-werror --enable-sspi --with-schannel --with-winidn --without-zlib tests: ~203 ~310 ~1056 ~1143 ~1299 ~2034 ~2037 ~2041 ~3000 ~3001 container: image: $(container_img) -- cgit v1.2.1