CentOS 7 (2)

rnpgp · Sep 20, 2023 · 159b32a · 159b32a
1 parent 24c8d7e
commit 159b32a
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/.github/workflows/centos-and-fedora-new.yml b/.github/workflows/centos-and-fedora-new.yml
@@ -75,6 +75,8 @@ jobs:
           - { container: 'fedora-35-amd64', backend: 'OpenSSL',           gpg_ver: 'system' }
           - { container: 'fedora-36-amd64', backend: 'OpenSSL',           gpg_ver: 'system' }
 
+# There is some ABI incompatibility between llvm-7, bitan shared library from ribose repo and sanitizer
+# So we are enforving static lib for sanitizers on CentOS 7
         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  }
@@ -100,15 +102,18 @@ jobs:
         with:
           submodules: true
 
+#          if [[ '${{ matrix.image.gpg_ver }}' != 'system' && '${{ matrix.image.gpg_ver }}' != '' ]]; then
+#            echo "/opt/gpg/${{ matrix.image.gpg_ver }}/bin" >> $GITHUB_PATH
+#          fi
       - name: Setup environment
         run: |
           set -o errexit -o pipefail -o noclobber -o nounset
           backend=${{ matrix.image.backend }}
           backend="$(echo "${backend:-}" | tr '[:upper:]' '[:lower:]')"
           echo CRYPTO_BACKEND="$backend" >> $GITHUB_ENV
-          if [[ '${{ matrix.image.gpg_ver }}' != 'system' && '${{ matrix.image.gpg_ver }}' != '' ]]; then
-            echo "/opt/gpg/${{ matrix.image.gpg_ver }}/bin" >> $GITHUB_PATH
-          fi
+
+          /opt/tools/tools.sh select_gpg_version_for_gha ${{ matrix.image.gpg_ver }}
+
           if [[ '${{ matrix.image.botan_ver }}' != 'system' && '${{ matrix.image.botan_ver }}' != '' ]]; then
             echo "/opt/botan/${{ matrix.image.botan_ver }}/bin" >> $GITHUB_PATH
             echo BOTAN_ROOT_DIR="/opt/botan/${{ matrix.image.botan_ver }}" >> $GITHUB_ENV
@@ -176,16 +181,16 @@ jobs:
           ./codecov
 
       - name: Install
-        if: env.BUILD_MODE != 'coverage'
+        if: env.BUILD_MODE != 'coverage' && env.SHARED_LIBS == 'on'
         run: cmake --install build
 
       - name: Checkout shell test framework
-        if: env.BUILD_MODE != 'coverage'
+        if: env.BUILD_MODE != 'coverage' && env.SHARED_LIBS == 'on'
         uses: actions/checkout@v3
         with:
           repository: kward/shunit2
           path: ci/tests/shunit2
 
       - name: Run additional ci tests
-        if: env.BUILD_MODE != 'coverage'
+        if: env.BUILD_MODE != 'coverage' && env.SHARED_LIBS == 'on'
         run:  RNP_INSTALL=/usr/local ci/tests/ci-tests.sh