Created new centos & fedora workflow based on pre-built containers

rnpgp · Sep 22, 2023 · 6eb6c59 · 6eb6c59
1 parent 8fac3f6
commit 6eb6c59
Show file tree

Hide file tree

Showing 6 changed files with 160 additions and 239 deletions.
diff --git a/.github/workflows/centos-and-fedora.yml b/.github/workflows/centos-and-fedora.yml
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -50,27 +50,27 @@ jobs:
       fail-fast: false
       matrix:
         image:
-          - { container: 'debian-11-i386',  cpu: 'i386',   arch: 'ia32',   backend: 'botan'   }
-          - { container: 'debian-11-i386',  cpu: 'i386',   arch: 'ia32',   backend: 'openssl' }
-          - { container: 'debian-11-amd64', cpu: 'x86_64', arch: 'x64',    backend: 'botan'   }
-          - { container: 'debian-11-amd64', cpu: 'x86_64', arch: 'x64',    backend: 'openssl' }
-          - { container: 'debian-10-i386',  cpu: 'i386',   arch: 'ia32',   backend: 'botan'   }
+          - { container: 'debian-11-i386',  cpu: 'i386',   backend: 'botan'   }
+          - { container: 'debian-11-i386',  cpu: 'i386',   backend: 'openssl' }
+          - { container: 'debian-11-amd64', cpu: 'x86_64', backend: 'botan'   }
+          - { container: 'debian-11-amd64', cpu: 'x86_64', backend: 'openssl' }
+          - { container: 'debian-10-i386',  cpu: 'i386',   backend: 'botan'   }
         env:
           - { CC: 'gcc',   CXX: 'g++'     }
           - { CC: 'clang', CXX: 'clang++' }
 
-    container: ghcr.io/rnpgp/ci-rnp-${{ matrix.image.container }}-${{ matrix.env.CC }}
+    container: ghcr.io/rnpgp/ci-rnp-${{ matrix.image.container }}
 
     env: ${{ matrix.env }}
     steps:
       - name: Checkout on x86_x64
-        if: matrix.image.CPU == 'x86_64'
+        if: matrix.image.cpu == 'x86_64'
         uses: actions/checkout@v3
         with:
           submodules: true
 
       - name: Checkout on i386
-        if: matrix.image.CPU == 'i386'
+        if: matrix.image.cpu == 'i386'
         uses: actions/checkout@v1
         with:
           submodules: true

diff --git a/ci/docker/Makefile b/ci/docker/Makefile
diff --git a/ci/docker/fedora35.Dockerfile b/ci/docker/fedora35.Dockerfile
diff --git a/ci/docker/fedora35.test-locally b/ci/docker/fedora35.test-locally
diff --git a/ci/tests/ci-tests.sh b/ci/tests/ci-tests.sh
@@ -118,9 +118,9 @@ test_supported_features() {
     fi
 
     if [[ "$OSTYPE" == darwin* ]]; then
-        export DYLD_LIBRARY_PATH="$library_path"
+        export DYLD_LIBRARY_PATH="$library_path${DYLD_LIBRARY_PATH:+:${DYLD_LIBRARY_PATH}}"
     else
-        export LD_LIBRARY_PATH="$library_path"
+        export LD_LIBRARY_PATH="$library_path${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}"
     fi
 
     "$RNP_INSTALL"/bin/rnp --version > rnp-version