Put multilib tests in their own job

Author: MatthiasValvekens

.github/actions/test-setup/action.yml

@@ -27,6 +27,9 @@ outputs:
   module:
     description: Path to PKCS#11 module
     value: ${{ steps.install-result.outputs.module }}
+  module2:
+    description: Path to alternative PKCS#11 module ('multi' only)
+    value: ${{ steps.install-result.outputs.module2 }}
 runs:
   using: "composite"
   steps:
@@ -35,7 +38,7 @@ runs:
       with:
         python-version: ${{ inputs.python-version }}
     - uses: ./.github/actions/install-softhsm
-      if: inputs.pkcs11-platform == 'softhsm'
+      if: inputs.pkcs11-platform == 'softhsm' || inputs.pkcs11-platform == 'multi'
       id: softhsm
       with:
         os: ${{ inputs.os }}
@@ -45,7 +48,7 @@ runs:
     - uses: ./.github/actions/install-opencryptoki
       # only run opencryptoki tests on ubuntu
       # (macos and windows don't seem to be supported)
-      if: inputs.pkcs11-platform == 'opencryptoki'
+      if: inputs.pkcs11-platform == 'opencryptoki' || inputs.pkcs11-platform == 'multi'
       id: opencryptoki
       with:
         os: ${{ inputs.os }}
@@ -60,6 +63,9 @@ runs:
           echo "module=${{ steps.opencryptoki.outputs.module }}" >> "$GITHUB_OUTPUT"
         elif [[ "$PLATFORM" == 'softhsm' ]]; then
           echo "module=${{ steps.softhsm.outputs.module }}" >> "$GITHUB_OUTPUT"
+        elif [[ "$PLATFORM" == 'multi' ]]; then
+          echo "module=${{ steps.softhsm.outputs.module }}" >> "$GITHUB_OUTPUT"
+          echo "module2=${{ steps.opencryptoki.outputs.module }}" >> "$GITHUB_OUTPUT"
         else
           echo "$PLATFORM is not a valid PKCS#11 platform choice"
           exit 1

.github/workflows/coverage.yml

@@ -50,6 +50,31 @@ jobs:
         with:
           name: coverage-${{ strategy.job-index }}
           path: "*-coverage.xml"
+  pytest-coverage-multilib:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Acquire sources
+        uses: actions/checkout@v4
+      - uses: ./.github/actions/test-setup
+        id: setup
+        with:
+          os: ubuntu-latest
+          pkcs11-platform: multi
+          token-label: ${{ env.PKCS11_TOKEN_LABEL }}
+          token-so-pin: ${{ env.PKCS11_TOKEN_SO_PIN }}
+          token-user-pin: ${{ env.PKCS11_TOKEN_PIN }}
+          python-version: "3.12"
+          dependency-group: coverage
+      - name: Run tests
+        run: uv run pytest -v --cov=pkcs11 --cov-branch --cov-report=xml:multilib-coverage.xml tests/test_multilib.py
+        env:
+          PKCS11_MODULE: ${{ steps.setup.outputs.module }}
+          PKCS11_MODULE2: ${{ steps.setup.outputs.module2 }}
+      - name: Stash coverage report
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-multilib
+          path: "*-coverage.xml"
   codecov-upload:
     permissions:
       actions: write
@@ -71,4 +96,4 @@ jobs:
           directory: ./reports/
           flags: unittests
           env_vars: OS,PYTHON
-          name: codecov-umbrella
+          name: codecov-umbrella

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ env:
   PKCS11_TOKEN_PIN: "1234"
   PKCS11_TOKEN_SO_PIN: "5678"
 jobs:
-  run:
+  tests:
     runs-on: ${{ matrix.os }}
     strategy:
       # Our test suite is pretty fast, so fail-fast: false allows for better troubleshooting.
@@ -54,3 +54,32 @@ jobs:
         run: uv run pytest -v
         env:
           PKCS11_MODULE: ${{ steps.setup.outputs.module }}
+  multilib-tests:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13"
+    steps:
+      - name: Acquire sources
+        uses: actions/checkout@v4
+      - uses: ./.github/actions/test-setup
+        id: setup
+        with:
+          os: ubuntu-latest
+          pkcs11-platform: multi
+          token-label: ${{ env.PKCS11_TOKEN_LABEL }}
+          token-so-pin: ${{ env.PKCS11_TOKEN_SO_PIN }}
+          token-user-pin: ${{ env.PKCS11_TOKEN_PIN }}
+          python-version: ${{ matrix.python-version }}
+          dependency-group: testing
+      - name: Run tests
+        run: uv run pytest -v tests/test_multilib.py
+        env:
+          PKCS11_MODULE: ${{ steps.setup.outputs.module }}
+          PKCS11_MODULE2: ${{ steps.setup.outputs.module2 }}