From 6a8c9a5a3f4a8e2e3b88969287bb7ef2c9b43639 Mon Sep 17 00:00:00 2001 From: Nickolay Olshevsky Date: Wed, 13 Mar 2024 13:34:23 +0200 Subject: [PATCH] CI: Update runner with disabled Brainpool to improve coverage. --- .github/workflows/centos-and-fedora.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/centos-and-fedora.yml b/.github/workflows/centos-and-fedora.yml index 522c5b6db3..6722cdaf24 100644 --- a/.github/workflows/centos-and-fedora.yml +++ b/.github/workflows/centos-and-fedora.yml @@ -95,9 +95,11 @@ jobs: - image: { name: 'Fedora 36', container: 'fedora-36-amd64', gpg_ver: stable, backend: OpenSSL } env: { CC: gcc, CXX: g++, BUILD_MODE: coverage, SHARED_LIBS: on } # Coverage report for OpenSSL 3.0 backend with disabled algos - - image: { name: 'Fedora 36', container: 'fedora-36-amd64', gpg_ver: stable, backend: OpenSSL } - env: { CC: gcc, CXX: g++, BUILD_MODE: coverage, SHARED_LIBS: on, idea: Off, sm2: Off, two: Off, blow: Off, rmd: Off } - + - image: { name: 'Fedora 36', container: 'fedora-36-amd64', gpg_ver: stable, backend: OpenSSL, idea: Off, sm2: Off, two: Off, blow: Off, rmd: Off, bp: Off } + env: { CC: gcc, CXX: g++, BUILD_MODE: coverage, SHARED_LIBS: on } + # Coverage report for Botan backend with disabled algos + - image: { name: 'Fedora 36', container: 'fedora-36-amd64', gpg_ver: stable, backend: Botan, idea: Off, sm2: Off, two: Off, blow: Off, rmd: Off, bp: Off } + env: { CC: gcc, CXX: g++, BUILD_MODE: coverage, SHARED_LIBS: on } container: ghcr.io/rnpgp/ci-rnp-${{ matrix.image.container }} @@ -121,6 +123,7 @@ jobs: echo "ENABLE_TWOFISH=${{ matrix.image.two }}" >> $GITHUB_ENV echo "ENABLE_BLOWFISH=${{ matrix.image.blow }}" >> $GITHUB_ENV echo "ENABLE_RIPEMD160=${{ matrix.image.rmd }}" >> $GITHUB_ENV + echo "ENABLE_BRAINPOOL=${{ matrix.image.bp }}" >> $GITHUB_ENV echo CORES="$(nproc --all)" >> $GITHUB_ENV @@ -149,13 +152,14 @@ jobs: [ -n "$ENABLE_TWOFISH" ] && two_opt=(-DENABLE_TWOFISH="$ENABLE_TWOFISH") [ -n "$ENABLE_BLOWFISH" ] && blow_opt=(-DENABLE_BLOWFISH="$ENABLE_BLOWFISH") [ -n "$ENABLE_RIPEMD160" ] && rmd_opt=(-DENABLE_RIPEMD160="$ENABLE_RIPEMD160") + [ -n "$ENABLE_BRAINPOOL" ] && bp_opt=(-DENABLE_BRAINPOOL="$ENABLE_BRAINPOOL") cmake -B build \ -DBUILD_SHARED_LIBS=${{ env.SHARED_LIBS }} \ -DDOWNLOAD_GTEST=ON \ -DCMAKE_BUILD_TYPE=Release \ -DCRYPTO_BACKEND=${{ matrix.image.backend }} \ - ${sm2_opt:-} ${idea_opt:-} ${two_opt:-} ${blow_opt:-} ${rmd_opt:-} ${cov_opt:-} ${san_opt:-} . + ${sm2_opt:-} ${idea_opt:-} ${two_opt:-} ${blow_opt:-} ${rmd_opt:-} ${bp_opt:-} ${cov_opt:-} ${san_opt:-} . - name: Build run: cmake --build build --parallel ${{ env.CORES }}