From e24819a4050f4066e466c14287bbbad4d371d15f Mon Sep 17 00:00:00 2001 From: Steffen Jaeckel Date: Fri, 26 Apr 2024 17:55:18 +0200 Subject: [PATCH] Run the xSSL Valgrind test in the same runner Building the SSL library is too much overhead, let's do this only once and re-build and run libstrophe with Valgrind enabled in the same runner. Signed-off-by: Steffen Jaeckel --- .github/workflows/main.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9c8e6d8..49ef927 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -75,9 +75,6 @@ jobs: - { version: "openssl-3.2.1", continue: false, libressl: false } - { version: "openssl-3.3", continue: true, libressl: false } - { version: "openssl-3.3.0", continue: false, libressl: false } - valgrind: - - { configure: '' , make: 'check' } - - { configure: '--enable-valgrind' , make: 'check-valgrind' } name: xSSL tests continue-on-error: ${{ matrix.xssl_versions.continue }} steps: @@ -95,11 +92,19 @@ jobs: - name: Build the library run: | ./bootstrap.sh - ./configure ${{ matrix.valgrind.configure }} PKG_CONFIG_PATH="${HOME}/xssl/lib/pkgconfig" CFLAGS="-Werror -g3" --prefix="${HOME}/xssl" + ./configure PKG_CONFIG_PATH="${HOME}/xssl/lib/pkgconfig" CFLAGS="-Werror -g3" --prefix="${HOME}/xssl" make -j$(nproc) - name: Run tests run: | - make -j$(nproc) ${{ matrix.valgrind.make }} + make -j$(nproc) check + - name: Build the library with Valgrind enabled + run: | + ./bootstrap.sh + ./configure --enable-valgrind PKG_CONFIG_PATH="${HOME}/xssl/lib/pkgconfig" CFLAGS="-Werror -g3" --prefix="${HOME}/xssl" + make -j$(nproc) + - name: Run tests with Valgrind enabled + run: | + make -j$(nproc) check-valgrind - name: Error logs if: ${{ failure() }} run: |