From 8f5d73af12679cf33e15d45af5873f1583cf4220 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Tue, 10 Sep 2024 16:35:17 +0200 Subject: [PATCH] GHA: add `valgrind` to the job titles using it, and tidy-ups There is a 4-5x difference in test run times. Make the reason more obvious by adding valgrind to the job names. Also: - tidy up job names. Closes #14853 --- .github/workflows/linux.yml | 36 +++++++++++++++++------------------ .github/workflows/wolfssl.yml | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 47dd1cc41e..f11a30c5a4 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -66,73 +66,73 @@ jobs: fail-fast: false matrix: build: - - name: bearssl + - name: bearssl valgrind install_packages: zlib1g-dev valgrind install_steps: bearssl pytest configure: LDFLAGS="-Wl,-rpath,$HOME/bearssl/lib" --with-bearssl=$HOME/bearssl --enable-debug singleuse: --unit - - name: bearssl-clang + - name: bearssl clang install_packages: zlib1g-dev clang install_steps: bearssl configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/bearssl/lib" --with-bearssl=$HOME/bearssl --enable-debug singleuse: --unit - - name: libressl heimdal + - name: libressl heimdal valgrind install_packages: zlib1g-dev heimdal-dev valgrind install_steps: libressl pytest configure: LDFLAGS="-Wl,-rpath,$HOME/libressl/lib" --with-openssl=$HOME/libressl --with-gssapi --enable-debug singleuse: --unit - - name: libressl heimdal + - name: libressl heimdal valgrind install_packages: zlib1g-dev heimdal-dev valgrind install_steps: libressl pytest generate: -DOPENSSL_ROOT_DIR=$HOME/libressl -DCURL_USE_GSSAPI=ON -DENABLE_DEBUG=ON -DCURL_LIBCURL_VERSIONED_SYMBOLS=ON singleuse: --unit - - name: libressl-clang + - name: libressl clang install_packages: zlib1g-dev clang install_steps: libressl configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/libressl/lib" --with-openssl=$HOME/libressl --enable-debug singleuse: --unit - - name: mbedtls + - name: mbedtls valgrind install_packages: libnghttp2-dev valgrind install_steps: mbedtls pytest configure: LDFLAGS="-Wl,-rpath,$HOME/mbedtls/lib" --with-mbedtls=$HOME/mbedtls --enable-debug singleuse: --unit - - name: mbedtls-clang + - name: mbedtls clang install_packages: libnghttp2-dev clang install_steps: mbedtls configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/mbedtls/lib" --with-mbedtls=$HOME/mbedtls --enable-debug singleuse: --unit - - name: msh3 + - name: msh3 valgrind install_packages: zlib1g-dev valgrind install_steps: quictls msh3 configure: LDFLAGS="-Wl,-rpath,$HOME/msh3/lib -Wl,-rpath,$HOME/quictls/lib" --with-msh3=$HOME/msh3 --with-openssl=$HOME/quictls --enable-debug singleuse: --unit - - name: openssl3 + - name: openssl3 valgrind install_packages: zlib1g-dev valgrind install_steps: gcc-11 openssl3 pytest configure: CFLAGS=-std=gnu89 LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib" --with-openssl=$HOME/openssl3 --enable-debug --enable-websockets singleuse: --unit - - name: openssl3-O3 + - name: openssl3-O3 valgrind install_packages: zlib1g-dev valgrind install_steps: gcc-11 openssl3 configure: CPPFLAGS=-DCURL_WARN_SIGN_CONVERSION CFLAGS=-O3 LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib" --with-openssl=$HOME/openssl3 --enable-debug --enable-websockets singleuse: --unit - - name: openssl3-clang krb5 + - name: openssl3 clang krb5 install_packages: zlib1g-dev libkrb5-dev clang install_steps: openssl3 configure: CC=clang LDFLAGS="-Wl,-rpath,$HOME/openssl3/lib" --with-openssl=$HOME/openssl3 --with-gssapi --enable-debug --enable-websockets singleuse: --unit - - name: openssl3-clang krb5 + - name: openssl3 clang krb5 install_packages: zlib1g-dev libkrb5-dev clang install_steps: openssl3 generate: -DOPENSSL_ROOT_DIR=$HOME/openssl3 -DCURL_USE_GSSAPI=ON -DENABLE_DEBUG=ON -DENABLE_WEBSOCKETS=ON @@ -170,35 +170,35 @@ jobs: --without-ssl --without-zlib --without-brotli --without-zstd --without-libpsl --without-nghttp2 --enable-debug --enable-websockets singleuse: --unit - - name: event-based + - name: event-based valgrind install_packages: libssh-dev valgrind configure: --enable-debug --disable-shared --disable-threaded-resolver --with-libssh --with-openssl tflags: -n -e '!TLS-SRP' singleuse: --unit - - name: hyper + - name: hyper valgrind install_steps: rust hyper valgrind configure: LDFLAGS="-Wl,-rpath,$HOME/hyper/target/debug" --with-openssl --with-hyper=$HOME/hyper --enable-debug --enable-websockets singleuse: --unit - - name: rustls + - name: rustls valgrind install_steps: rust rustls pytest valgrind libpsl-dev configure: --with-rustls=$HOME/rustls --enable-debug singleuse: --unit - - name: Intel compiler - without SSL + - name: IntelC !SSL valgrind install_packages: zlib1g-dev valgrind install_steps: intel configure: CC=icc --enable-debug --without-ssl singleuse: --unit - - name: Intel compiler - OpenSSL + - name: IntelC openssl valgrind install_packages: zlib1g-dev libssl-dev valgrind install_steps: intel configure: CC=icc --enable-debug --with-openssl singleuse: --unit - - name: Slackware-openssl-with-gssapi-gcc + - name: Slackware openssl gssapi gcc # These are essentially the same flags used to build the curl Slackware package # https://ftpmirror.infania.net/slackware/slackware64-current/source/n/curl/curl.SlackBuild configure: --with-openssl --with-libssh2 --with-gssapi --enable-ares --enable-static=no --without-ca-bundle --with-ca-path=/etc/ssl/certs diff --git a/.github/workflows/wolfssl.yml b/.github/workflows/wolfssl.yml index ebf099aad3..0b3104bbc4 100644 --- a/.github/workflows/wolfssl.yml +++ b/.github/workflows/wolfssl.yml @@ -54,11 +54,11 @@ jobs: fail-fast: false matrix: build: - - name: wolfssl (configured with --enable-all) + - name: wolfssl (with --enable-all) install: configure: LDFLAGS="-Wl,-rpath,$HOME/wssl/lib" --with-wolfssl=$HOME/wssl --enable-debug wolfssl-configure: --enable-all - - name: wolfssl (configured with --enable-opensslextra) + - name: wolfssl (with --enable-opensslextra) valgrind install: valgrind configure: LDFLAGS="-Wl,-rpath,$HOME/wssl/lib" --with-wolfssl=$HOME/wssl --enable-debug wolfssl-configure: --enable-opensslextra -- 2.47.3