WIP

The-Mule · Oct 9, 2024 · 1ecdafd · 1ecdafd
1 parent 99e25ba
commit 1ecdafd
Showing 1 changed file with 9 additions and 13 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -12,8 +12,6 @@ jobs:
     name: Integration tests
     runs-on: ubuntu-22.04
     container: fedora:rawhide
-    env:
-      PKCS11_MODULE: /usr/lib64/ossl-modules/pkcs11.so
     steps:
       - name: Get Date for DNF cache entry
         id: get-date
@@ -39,6 +37,9 @@ jobs:
               'perl(IPC::Cmd)' 'perl(FindBin)' 'perl(lib)' \
               'perl(File::Compare)' 'perl(File::Copy)'
 
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
       - name: Get Kryoptic
         id: kryoptic_setup
         run: |
@@ -75,27 +76,22 @@ jobs:
         run: |
           cd kryoptic
           cargo build
-          cargo test | tee testout.log 2>&1
-          grep -q "0 failed" testout.log
-
-      - name: Checkout Repository
-        uses: actions/checkout@v4
 
       - name: Setup, Build and Install pkcs11-provider
         run: |
           meson setup -Dlibdir=/usr/lib64 builddir
           meson compile -C builddir
           meson install -C builddir
+
       - name: Test httpd with softhsm
+        env:
+          PKCS11_MODULE: /usr/lib64/ossl-modules/pkcs11.so
         run: |
-          pushd tests/integration
-          bash -e httpd.sh
-          popd
+          pushd tests/integration && bash -e httpd.sh ; popd
       - name: Test bind with kryoptic
         env:
+          PKCS11_MODULE: /usr/lib64/ossl-modules/pkcs11.so
           KRYOPTIC: ${{ steps.kryoptic_setup.outputs.KRYOPTIC }}
         run: |
-          pushd tests/integration
-          bash -e bind.sh kryoptic
-          popd
+          pushd tests/integration && bash -e bind.sh kryoptic ; popd