From 3b6c7142f6e86dc575a97fb9c9f678e5e5e1db5c Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 27 Mar 2025 23:44:51 +0100 Subject: [PATCH] GHA/linux: move pytests to non-valgrind job variants, drop 2 redundant runs - move pytest from the valgrind variant of the mbedTLS and Rustls jobs to their non-valgrind counterpart (they different in C compiler and build tool respectively). To parallelize more and finish the workflow faster. - drop pytest from the valgrind variant of the two identical (other than the build tool) 'libressl heimdal' jobs. Saves 1.5 minutes CI time. - drop pytest from the longest valgrind job to make the workflow finish almost 2 minutes faster. `sync-resolver` is its unique build propery. It wasn't pytested on Azure. - explicitly install `libnghttp2-dev` and `libldap-dev` to keep them in jobs where pytest deps were installing them implicitly before this patch. Before: https://github.com/curl/curl/actions/runs/14118080563 After: https://github.com/curl/curl/actions/runs/14118903372?pr=16851 Closes #16851 --- .github/workflows/linux.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index c632ddb203..53f35da61a 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -80,13 +80,13 @@ jobs: configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/bearssl/lib" --with-bearssl=$HOME/bearssl --enable-debug - name: libressl heimdal - install_packages: zlib1g-dev heimdal-dev + install_packages: zlib1g-dev libnghttp2-dev libldap-dev heimdal-dev install_steps: libressl pytest configure: LDFLAGS="-Wl,-rpath,$HOME/libressl/lib" --with-openssl=$HOME/libressl --with-gssapi --enable-debug - name: libressl heimdal valgrind - install_packages: zlib1g-dev heimdal-dev valgrind - install_steps: libressl pytest + install_packages: zlib1g-dev libnghttp2-dev libldap-dev heimdal-dev valgrind + install_steps: libressl generate: -DOPENSSL_ROOT_DIR=$HOME/libressl -DCURL_USE_GSSAPI=ON -DENABLE_DEBUG=ON -DCURL_LIBCURL_VERSIONED_SYMBOLS=ON - name: libressl clang @@ -105,13 +105,13 @@ jobs: configure: LDFLAGS="-Wl,-rpath,$HOME/wolfssl-opensslextra/lib" --with-wolfssl=$HOME/wolfssl-opensslextra --enable-ech --enable-debug - name: mbedtls valgrind - install_packages: libnghttp2-dev valgrind - install_steps: mbedtls pytest + install_packages: libnghttp2-dev libldap-dev valgrind + install_steps: mbedtls configure: LDFLAGS="-Wl,-rpath,$HOME/mbedtls/lib" --with-mbedtls=$HOME/mbedtls --enable-debug - name: mbedtls clang - install_packages: libnghttp2-dev clang - install_steps: mbedtls + install_packages: libnghttp2-dev libldap-dev clang + install_steps: mbedtls pytest configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/mbedtls/lib" --with-mbedtls=$HOME/mbedtls --enable-debug - name: mbedtls @@ -155,8 +155,7 @@ jobs: configure: --with-openssl --enable-debug --disable-unity - name: openssl libssh2 sync-resolver valgrind - install_packages: zlib1g-dev libssh2-1-dev valgrind - install_steps: pytest + install_packages: zlib1g-dev libssh2-1-dev libnghttp2-dev libldap-dev valgrind configure: --with-openssl --enable-debug --disable-threaded-resolver --with-libssh2 - name: openssl @@ -266,12 +265,13 @@ jobs: tflags: -n --test-duphandle '!TLS-SRP' - name: rustls valgrind - install_packages: valgrind - install_steps: rust rustls pytest + install_packages: libnghttp2-dev libldap-dev valgrind + install_steps: rust rustls configure: --with-rustls --enable-ech --enable-debug - name: rustls - install_steps: rust rustls skipall + install_packages: libnghttp2-dev libldap-dev + install_steps: rust rustls skipall pytest generate: -DCURL_USE_RUSTLS=ON -DUSE_ECH=ON -DENABLE_DEBUG=ON - name: IntelC openssl -- 2.47.2