From 85e825770a161ae23336ba8f7d381fd2653f6ea7 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 20 Apr 2026 09:44:24 +0200 Subject: [PATCH] GHA: bump test minimums (more) Follow-up to 701a8319ec96c0b73c39e16c5db68dd758419c2 #21353 Closes #21382 --- .github/workflows/http3-linux.yml | 8 ++++---- .github/workflows/linux.yml | 34 +++++++++++++++---------------- .github/workflows/macos.yml | 10 ++++----- .github/workflows/non-native.yml | 2 +- .github/workflows/windows.yml | 14 +++++++------ 5 files changed, 35 insertions(+), 33 deletions(-) diff --git a/.github/workflows/http3-linux.yml b/.github/workflows/http3-linux.yml index 750d0ce0a3..b0d22332b4 100644 --- a/.github/workflows/http3-linux.yml +++ b/.github/workflows/http3-linux.yml @@ -34,7 +34,7 @@ permissions: {} env: MAKEFLAGS: -j 5 CURL_CI: github - CURL_TEST_MIN: 1840 + CURL_TEST_MIN: 1850 # renovate: datasource=github-releases depName=openssl/openssl versioning=semver extractVersion=^openssl-(?.+)$ registryUrl=https://github.com OPENSSL_VERSION: 4.0.0 # manually bumped @@ -413,7 +413,7 @@ jobs: matrix: build: - name: 'openssl' - tflags: '--min=1690' + tflags: '--min=1700' LDFLAGS: -Wl,-rpath,/home/runner/openssl/build/lib PKG_CONFIG_PATH: /home/runner/openssl/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig configure: >- @@ -439,7 +439,7 @@ jobs: --with-openssl=/home/runner/openssl-prev/build --with-ngtcp2=/home/runner/ngtcp2-openssl-prev/build --enable-ssls-export - name: 'openssl-prev' - tflags: '--min=1690' + tflags: '--min=1700' PKG_CONFIG_PATH: "\ /home/runner/openssl-prev/build/lib/pkgconfig:\ /home/runner/nghttp3/build/lib/pkgconfig:\ @@ -526,7 +526,7 @@ jobs: - name: 'wolfssl' install_packages: libssh2-1-dev - tflags: '--min=1890' + tflags: '--min=1900' PKG_CONFIG_PATH: /home/runner/wolfssl/build/lib/pkgconfig:/home/runner/nghttp3/build/lib/pkgconfig:/home/runner/ngtcp2/build/lib/pkgconfig:/home/runner/nghttp2/build/lib/pkgconfig generate: >- -DCURL_USE_WOLFSSL=ON -DUSE_NGTCP2=ON diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 02d6fed2c6..0682d7f78e 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -32,7 +32,7 @@ permissions: {} env: MAKEFLAGS: -j 5 CURL_CI: github - CURL_TEST_MIN: 1650 + CURL_TEST_MIN: 1660 # renovate: datasource=github-tags depName=libressl/portable versioning=semver registryUrl=https://github.com LIBRESSL_VERSION: 4.3.1 # renovate: datasource=github-tags depName=wolfSSL/wolfssl versioning=semver extractVersion=^v?(?.+)-stable$ registryUrl=https://github.com @@ -110,7 +110,7 @@ jobs: image: ubuntu-24.04-arm install_packages: valgrind install_steps: wolfssl-opensslextra-arm - tflags: '--min=780 1 to 950' + tflags: '--min=815 1 to 1000' LDFLAGS: -Wl,-rpath,/home/runner/wolfssl-opensslextra/lib configure: --with-wolfssl=/home/runner/wolfssl-opensslextra --enable-ech --enable-debug @@ -118,7 +118,7 @@ jobs: image: ubuntu-24.04-arm install_packages: valgrind install_steps: wolfssl-opensslextra-arm - tflags: '--min=800 951 to 9999' + tflags: '--min=835 1001 to 9999' LDFLAGS: -Wl,-rpath,/home/runner/wolfssl-opensslextra/lib configure: --with-wolfssl=/home/runner/wolfssl-opensslextra --enable-ech --enable-debug @@ -126,7 +126,7 @@ jobs: image: ubuntu-24.04-arm install_packages: libnghttp2-dev libidn2-dev libldap-dev libgss-dev valgrind install_steps: mbedtls-latest-arm - tflags: '--min=830 1 to 950' + tflags: '--min=850 1 to 1000' LDFLAGS: -Wl,-rpath,/home/runner/mbedtls/lib PKG_CONFIG_PATH: /home/runner/mbedtls/lib/pkgconfig generate: -DCURL_USE_MBEDTLS=ON -DENABLE_DEBUG=ON -DCURL_USE_GSSAPI=ON -DCURL_DROP_UNUSED=ON @@ -135,7 +135,7 @@ jobs: image: ubuntu-24.04-arm install_packages: libnghttp2-dev libidn2-dev libldap-dev libgss-dev valgrind install_steps: mbedtls-latest-arm - tflags: '--min=800 951 to 9999' + tflags: '--min=900 1001 to 9999' LDFLAGS: -Wl,-rpath,/home/runner/mbedtls/lib PKG_CONFIG_PATH: /home/runner/mbedtls/lib/pkgconfig generate: -DCURL_USE_MBEDTLS=ON -DENABLE_DEBUG=ON -DCURL_USE_GSSAPI=ON @@ -187,13 +187,13 @@ jobs: - name: 'openssl libssh2 sync-resolver valgrind 1 +analyzer' image: ubuntu-24.04-arm install_packages: libidn2-dev libssh2-1-dev libnghttp2-dev libldap-dev valgrind - tflags: '--min=920 1 to 950' + tflags: '--min=965 1 to 1000' generate: -DENABLE_DEBUG=ON -DENABLE_THREADED_RESOLVER=OFF -DCURL_GCC_ANALYZER=ON -DCURL_ENABLE_NTLM=ON - name: 'openssl libssh2 sync-resolver valgrind 2' image: ubuntu-24.04-arm install_packages: libidn2-dev libssh2-1-dev libnghttp2-dev libldap-dev valgrind - tflags: '--min=910 951 to 9999' + tflags: '--min=920 1001 to 9999' generate: -DENABLE_DEBUG=ON -DENABLE_THREADED_RESOLVER=OFF -DCURL_ENABLE_NTLM=ON - name: 'openssl intel C89' @@ -210,13 +210,13 @@ jobs: - name: 'openssl -O3 libssh valgrind 1' install_packages: libssh-dev valgrind CFLAGS: -O3 - tflags: '--min=920 1 to 950' + tflags: '--min=950 1 to 1000' generate: -DENABLE_DEBUG=ON -DCURL_USE_LIBSSH=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=50 -DCURL_ENABLE_NTLM=ON - name: 'openssl -O3 libssh valgrind 2' install_packages: libssh-dev valgrind CFLAGS: -O3 - tflags: '--min=890 951 to 9999' + tflags: '--min=900 1001 to 9999' generate: -DENABLE_DEBUG=ON -DCURL_USE_LIBSSH=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=50 -DCURL_ENABLE_NTLM=ON - name: 'openssl clang krb5 openldap static' @@ -249,7 +249,7 @@ jobs: - name: 'openssl https-only' image: ubuntu-24.04-arm - tflags: '--min=1240' + tflags: '--min=1260' configure: >- --with-openssl --enable-debug --disable-unity --disable-dict --disable-gopher --disable-ldap --disable-telnet @@ -261,13 +261,13 @@ jobs: - name: 'openssl torture 1' install_packages: libnghttp2-dev libssh2-1-dev libc-ares-dev - tflags: '-t --shallow=25 --min=920 1 to 950' + tflags: '-t --shallow=25 --min=960 1 to 1000' torture: true generate: -DCURL_USE_OPENSSL=ON -DENABLE_DEBUG=ON -DENABLE_ARES=ON -DCURL_ENABLE_NTLM=ON - name: 'openssl torture 2' install_packages: libnghttp2-dev libssh2-1-dev libc-ares-dev - tflags: '-t --shallow=25 --min=900 951 to 9999' + tflags: '-t --shallow=25 --min=915 1001 to 9999' torture: true generate: -DCURL_USE_OPENSSL=ON -DENABLE_DEBUG=ON -DENABLE_ARES=ON -DCURL_ENABLE_NTLM=ON @@ -283,7 +283,7 @@ jobs: - name: '!ssl !http !smtp !imap' image: ubuntu-24.04-arm - tflags: '--min=495' + tflags: '--min=500' configure: --without-ssl --enable-debug --disable-http --disable-smtp --disable-imap --disable-unity - name: 'libressl Fil-C' @@ -397,12 +397,12 @@ jobs: LDFLAGS: -fsanitize=memory LIBS: -ldl configure: --without-ssl --without-zlib --without-brotli --without-zstd --without-libpsl --without-nghttp2 --enable-debug - tflags: '--min=1480' + tflags: '--min=1540' - name: 'event-based' install_packages: libssh-dev configure: --enable-debug --enable-static --disable-shared --disable-threaded-resolver --with-libssh --with-openssl --enable-ntlm - tflags: '-n --test-event --min=1350' + tflags: '-n --test-event --min=1420' - name: 'duphandle' image: ubuntu-24.04-arm @@ -413,13 +413,13 @@ jobs: - name: 'rustls valgrind 1' install_packages: libnghttp2-dev libldap-dev valgrind install_steps: rust rustls - tflags: '--min=780 1 to 950' + tflags: '--min=820 1 to 1000' generate: -DCURL_USE_RUSTLS=ON -DUSE_ECH=ON -DENABLE_DEBUG=ON - name: 'rustls valgrind 2' install_packages: libnghttp2-dev libldap-dev valgrind install_steps: rust rustls - tflags: '--min=820 951 to 9999' + tflags: '--min=830 1001 to 9999' generate: -DCURL_USE_RUSTLS=ON -DUSE_ECH=ON -DENABLE_DEBUG=ON - name: 'rustls' diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9494cea4f6..e06995cafc 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -228,13 +228,13 @@ jobs: - name: '!ssl !debug brotli zstd' compiler: gcc-13 configure: --without-ssl --with-brotli --with-zstd --with-apple-idn - tflags: '--min=1500' + tflags: '--min=1520' xcode: '' # default Xcode. Set it once to silence actionlint. - name: '!ssl libssh2 AppleIDN' compiler: clang generate: -DENABLE_DEBUG=ON -DCURL_USE_LIBSSH2=ON -DUSE_APPLE_IDN=ON -DCURL_ENABLE_SSL=OFF -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF - tflags: '--min=1600' + tflags: '--min=1630' - name: 'OpenSSL libssh c-ares' compiler: clang @@ -249,7 +249,7 @@ jobs: - name: '!ssl HTTP-only c-ares' macos-version-min: '10.15' # Catalina (2019) compiler: clang - tflags: '--min=940' + tflags: '--min=960' generate: >- -DENABLE_DEBUG=ON -DENABLE_ARES=ON -DCURL_ENABLE_SSL=OFF -DHTTP_ONLY=ON @@ -285,7 +285,7 @@ jobs: - name: 'OpenSSL event-based' compiler: clang generate: -DENABLE_DEBUG=ON -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl -DCURL_BROTLI=OFF -DCURL_ZSTD=OFF -DCURL_USE_LIBSSH2=OFF -DCURL_ENABLE_NTLM=ON - tflags: '--test-event --min=1350' + tflags: '--test-event --min=1400' - name: 'OpenSSL gsasl AppleIDN SecTrust +examples' compiler: clang @@ -366,7 +366,7 @@ jobs: compiler: clang install: rustls-ffi generate: -DENABLE_DEBUG=ON -DCURL_USE_RUSTLS=ON -DUSE_ECH=ON -DCURL_DISABLE_LDAP=ON -DCURL_ENABLE_NTLM=ON - tflags: '--min=1700' + tflags: '--min=1730' - name: 'OpenSSL torture 1' compiler: clang diff --git a/.github/workflows/non-native.yml b/.github/workflows/non-native.yml index ec38f1386c..dbe2714074 100644 --- a/.github/workflows/non-native.yml +++ b/.github/workflows/non-native.yml @@ -33,7 +33,7 @@ permissions: {} env: CURL_CI: github - CURL_TEST_MIN: 1800 + CURL_TEST_MIN: 1820 jobs: netbsd: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9069b1665d..71739e6352 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -76,6 +76,7 @@ jobs: run: shell: D:\cygwin\bin\bash.exe '{0}' # zizmor: ignore[misfeature] env: + CURL_TEST_MIN: 1850 LDFLAGS: -s MAKEFLAGS: -j 5 SHELLOPTS: 'igncr' @@ -249,7 +250,7 @@ jobs: include: # MSYS - { name: '!proxy', - build: 'autotools', sys: 'msys' , env: 'x86_64' , tflags: '--min=1600', + build: 'autotools', sys: 'msys' , env: 'x86_64' , tflags: '--min=1620', config: '--enable-debug --with-openssl --disable-threaded-resolver --disable-proxy --enable-ntlm', install: 'openssl-devel libssh2-devel' } - { name: 'default', @@ -273,16 +274,16 @@ jobs: 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' } - { name: 'schannel c-ares U', type: 'Debug', - build: 'cmake' , sys: 'mingw64' , env: 'x86_64' , tflags: '--min=1700', + 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', install: 'mingw-w64-x86_64-c-ares mingw-w64-x86_64-libssh2' } # MinGW torture - { name: 'schannel U torture 1', type: 'Debug', - build: 'cmake' , sys: 'ucrt64' , env: 'ucrt-x86_64' , tflags: '-t --shallow=13 --min=700 1 to 950' , + build: 'cmake' , sys: 'ucrt64' , env: 'ucrt-x86_64' , tflags: '-t --shallow=13 --min=820 1 to 950', config: '-DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_SCHANNEL=ON -DENABLE_UNICODE=ON -DENABLE_ARES=ON', install: 'mingw-w64-ucrt-x86_64-c-ares mingw-w64-ucrt-x86_64-libssh2' } - { name: 'schannel U torture 2', type: 'Debug', - build: 'cmake' , sys: 'ucrt64' , env: 'ucrt-x86_64' , tflags: '-t --shallow=13 --min=700 951 to 9999', + build: 'cmake' , sys: 'ucrt64' , env: 'ucrt-x86_64' , tflags: '-t --shallow=13 --min=820 951 to 9999', config: '-DENABLE_DEBUG=ON -DBUILD_SHARED_LIBS=OFF -DCURL_USE_SCHANNEL=ON -DENABLE_UNICODE=ON -DENABLE_ARES=ON', install: 'mingw-w64-ucrt-x86_64-c-ares mingw-w64-ucrt-x86_64-libssh2' } # WARNING: libssh uses hard-coded world-writable paths (C:ProgramData/, /etc/..., ~/.ssh/) @@ -566,7 +567,7 @@ jobs: run: shell: msys2 {0} # zizmor: ignore[misfeature] env: - CURL_TEST_MIN: 1600 + CURL_TEST_MIN: 1630 LDFLAGS: -s MAKEFLAGS: -j 5 MATRIX_DIR: '${{ matrix.dir }}' @@ -921,6 +922,7 @@ jobs: type: 'Debug' image: 'windows-2025-vs2026' chkprefill: '_chkprefill' + tflags: '--min=1850' config: >- -DENABLE_DEBUG=ON -DCURL_USE_OPENSSL=ON -DUSE_NGTCP2=ON @@ -957,7 +959,7 @@ jobs: type: 'Debug' image: 'windows-11-arm' openssh: 'OpenSSH-Windows' - tflags: '--min=1700' + tflags: '--min=1720' # leave SMB disabled to save 30-60 seconds by omitting prereqs, # to counteract the slower test run step config: >-