From a3d02e5a81db447388ede71642371bd1f77a740e Mon Sep 17 00:00:00 2001 From: "Maxim [maxirmx] Samsonov" Date: Wed, 20 Sep 2023 09:58:16 +0300 Subject: [PATCH] Fixing build parameters --- .github/workflows/centos-and-fedora-new.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/centos-and-fedora-new.yml b/.github/workflows/centos-and-fedora-new.yml index 06743569a..b01535196 100644 --- a/.github/workflows/centos-and-fedora-new.yml +++ b/.github/workflows/centos-and-fedora-new.yml @@ -40,7 +40,7 @@ env: jobs: tests: - name: ${{ matrix.image.container }} [CC ${{ matrix.env.CC }}; backend ${{ matrix.image.backend }} ${{ matrix.image.botan_ver }}; gpg ${{ matrix.image.gpg_ver }}] + name: ${{ matrix.image.container }} [CC ${{ matrix.env.CC }}; backend ${{ matrix.image.backend }} ${{ matrix.image.botan_ver }}; gpg ${{ matrix.image.gpg_ver }}; ${{ matrix.env.BUILD_MODE }}] runs-on: ubuntu-latest timeout-minutes: 120 strategy: @@ -118,11 +118,11 @@ jobs: printf "\nrnpuser\tsoft\tnproc\tunlimited\n" > /etc/security/limits.d/30-rnpuser.conf # Need to build HEAD version since it is always different - - name: Build gpg HEAD version if required + - name: Build gpg head if: matrix.image.gpg_ver == 'head' run: /opt/tools/tools.sh build_and_install_gpg head - - name: Build botan HEAD version if required + - name: Build botan head if: matrix.image.botan_ver == 'head' run: /opt/tools/tools.sh build_and_install_botan head @@ -131,13 +131,14 @@ jobs: cmakeopts=(-DCRYPTO_BACKEND=${{ matrix.image.backend }}) [[ "${{ env.BUILD_MODE }}" = "coverage" ]] && cmakeopts+=(-DENABLE_COVERAGE=yes) [[ "${{ env.BUILD_MODE }}" = "sanitize" ]] && cmakeopts+=(-DENABLE_SANITIZERS=yes) - [ -n "${{ env.ENABLE_SM2 }}" ] && cmakeopts+=(-DENABLE_SM2="${{ env.ENABLE_SM2 }}") - [ -n "${{ env.ENABLE_IDEA }}" ] && cmakeopts+=(-DENABLE_IDEA="${{ env.ENABLE_IDEA }}") + [ -n "$ENABLE" ] && cmakeopts+=(-DENABLE_SM2="$ENABLE_SM2") + [ -n "$ENABLE_IDEA" ] && cmakeopts+=(-DENABLE_IDEA="$ENABLE_IDEA") cmake -B build \ -DBUILD_SHARED_LIBS=ON \ -DDOWNLOAD_GTEST=ON \ -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_COVERAGE=${parameter:=word} $cmakeopts . - name: Build