CentOS 7

rnpgp · Sep 20, 2023 · 24c8d7e · 24c8d7e
1 parent 69353bd
commit 24c8d7e
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/.github/workflows/centos-and-fedora-new.yml b/.github/workflows/centos-and-fedora-new.yml
@@ -47,10 +47,10 @@ jobs:
       fail-fast: false
       matrix:
         env:
-          - { CC: gcc,   CXX: g++,     BUILD_MODE: normal  }
+          - { CC: gcc,   CXX: g++,     BUILD_MODE: normal,   SHARED_LIBS: on  }
 #   normal --> Release build; sanitize --> Debug build so theoretically test conditions are different
 #         - { CC: clang, CXX: clang++, BUILD_MODE: normal   }
-          - { CC: clang, CXX: clang++, BUILD_MODE: sanitize }
+          - { CC: clang, CXX: clang++, BUILD_MODE: sanitize, SHARED_LIBS: on   }
 
 # All cotainers have gpg stable and lts installed
 # centos-8-amd64 has botan 2.18.2 installed
@@ -75,16 +75,21 @@ jobs:
           - { container: 'fedora-35-amd64', backend: 'OpenSSL',           gpg_ver: 'system' }
           - { container: 'fedora-36-amd64', backend: 'OpenSSL',           gpg_ver: 'system' }
 
+        exclude:
+          - image: { container: 'centos-7-amd64', gpg_ver: stable, backend: Botan, botan_ver: 'system'  }
+            env:   { CC: clang, CXX: clang++, BUILD_MODE: sanitize,   SHARED_LIBS: on  }
         include:
+          - image: { container: 'centos-7-amd64', gpg_ver: stable, backend: Botan, botan_ver: 'system'  }
+            env:   { CC: clang, CXX: clang++, BUILD_MODE: sanitize,   SHARED_LIBS: off  }
           # Coverage report for Botan backend
           - image: { container: 'centos-8-amd64', gpg_ver: stable, backend: Botan, botan_ver: '2.18.2'  }
-            env:   { CC: gcc, CXX: g++, BUILD_MODE: coverage                         }
+            env:   { CC: gcc, CXX: g++, BUILD_MODE: coverage,   SHARED_LIBS: on  }
           # Coverage report for OpenSSL 1.1.1 backend
           - image: { container: 'centos-8-amd64', gpg_ver: stable, backend: OpenSSL  }
-            env:   { CC: gcc, CXX: g++, BUILD_MODE: coverage                         }
+            env:   { CC: gcc, CXX: g++, BUILD_MODE: coverage,   SHARED_LIBS: on  }
           # Coverage report for OpenSSL 3.0 backend
           - image: { container: 'fedora-36-amd64', gpg_ver: stable, backend: OpenSSL }
-            env:   { CC: gcc, CXX: g++, BUILD_MODE: coverage                         }
+            env:   { CC: gcc, CXX: g++, BUILD_MODE: coverage,   SHARED_LIBS: on  }
 
     container: ghcr.io/maxirmx/ci-rnp-${{ matrix.image.container }}
 
@@ -135,11 +140,12 @@ jobs:
 
           [[ "${{ env.BUILD_MODE }}" = "coverage" ]] && cov_opt=(-DENABLE_COVERAGE=yes)
           [[ "${{ env.BUILD_MODE }}" = "sanitize" ]] && san_opt=(-DENABLE_SANITIZERS=yes)
+
           [ -n "$ENABLE_SM2" ] && sm2_opt=(-DENABLE_SM2="$ENABLE_SM2")
           [ -n "$ENABLE_IDEA" ] && idea_opt=(-DENABLE_IDEA="$ENABLE_IDEA")
 
           cmake -B build                                           \
-                -DBUILD_SHARED_LIBS=ON                             \
+                -DBUILD_SHARED_LIBS=${{ env.SHARED_LIBS }}         \
                 -DDOWNLOAD_GTEST=ON                                \
                 -DCMAKE_BUILD_TYPE=Release                         \
                 -DCRYPTO_BACKEND=${{ matrix.image.backend }}       \