Added gpg version selector

rnpgp · Sep 18, 2023 · 5859a62 · 5859a62
1 parent eff1e46
commit 5859a62
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/.github/workflows/centos-and-fedora-new.yml b/.github/workflows/centos-and-fedora-new.yml
@@ -39,7 +39,7 @@ env:
 
 jobs:
   tests:
-    name: ${{ matrix.image.container }} [CC ${{ matrix.env.CC }}; backend ${{ matrix.image.backend }}; GnuPG system-shipped]
+    name: ${{ matrix.image.container }} [CC ${{ matrix.env.CC }}; backend ${{ matrix.image.backend }}; ${{ matrix.image.gpg_ver }}]
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, 'skip ci')"
     timeout-minutes: 120
@@ -53,13 +53,13 @@ jobs:
           - { CC: clang, CXX: clang++, BUILD_MODE: sanitize }
 
         image:
-          - { container: 'centos-7-amd64',  backend: 'Botan'     }
-          - { container: 'centos-8-amd64',  backend: 'Botan'     }
-          - { container: 'centos-9-amd64',  backend: 'Botan'     }
-          - { container: 'fedora-35-amd64', backend: 'Botan'     }
-          - { container: 'fedora-36-amd64', backend: 'Botan'     }
-          - { container: 'fedora-35-amd64', backend: 'OpenSSL'   }
-          - { container: 'fedora-36-amd64', backend: 'OpenSSL'   }
+          - { container: 'centos-7-amd64',  backend: 'Botan',   gpg_ver: 'stable' }
+          - { container: 'centos-8-amd64',  backend: 'Botan',   gpg_ver: 'system' }
+          - { container: 'centos-9-amd64',  backend: 'Botan',   gpg_ver: 'system' }
+          - { container: 'fedora-35-amd64', backend: 'Botan',   gpg_ver: 'system' }
+          - { container: 'fedora-36-amd64', backend: 'Botan',   gpg_ver: 'system' }
+          - { container: 'fedora-35-amd64', backend: 'OpenSSL', gpg_ver: 'system' }
+          - { container: 'fedora-36-amd64', backend: 'OpenSSL', gpg_ver: 'system' }
 
     container: ghcr.io/maxirmx/ci-rnp-${{ matrix.image.container }}
 
@@ -72,14 +72,18 @@ jobs:
 
       - name: Setup environment
         shell: bash
-        # rnpuser is only needed for rnpkeys_generatekey_verifykeyHomeDirNoPermission test
         run: |
       - 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
+          gpg_ver=${{ matrix.image.gpg_ver }}
+          gpg_ver="$(echo "${gpg_ver:-}" | tr '[:upper:]' '[:lower:]')"
+          if [[ gpg_ver != 'system' ]]; then
+            echo "/opt/gpg/$gpg_ver/bin" >> $GITHUB_PATH
+          fi
           useradd rnpuser
           printf "\nrnpuser\tALL=(ALL)\tNOPASSWD:\tALL" > /etc/sudoers.d/rnpuser
           printf "\nrnpuser\tsoft\tnproc\tunlimited\n" > /etc/security/limits.d/30-rnpuser.conf