Build and test in a matrix

Signed-off-by: Wiktor Kwapisiewicz <[email protected]>

Author: wiktor-k

.github/actions/ci_script/action.yml

@@ -32,14 +32,46 @@ jobs:
   build:
     name: Execute CI script
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        target:
+          - armv7-unknown-linux-gnueabi
+          - armv7-unknown-linux-gnueabihf
+          - arm-unknown-linux-gnueabi
+          - aarch64-unknown-linux-gnu
+          - i686-unknown-linux-gnu
+          - loongarch64-unknown-linux-gnu
+          - powerpc64-unknown-linux-gnu
+          - powerpc64le-unknown-linux-gnu
+          - x86_64-pc-windows-msvc
+          - x86_64-apple-darwin
+          - aarch64-apple-darwin
+          - x86_64-unknown-freebsd
+          - riscv64gc-unknown-linux-gnu
+        toolchain:
+          - stable
+          - "1.66.0" # MSRV
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust toolchain
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
-      - name: "Installs SoftHSM and execute tests"
-        uses: ./.github/actions/ci_script
+          toolchain: ${{ matrix.toolchain }}
+      - name: Install SoftHSM
+        run: |
+          sudo apt-get update -y -qq &&
+          sudo apt-get install -y -qq libsofthsm2 &&
+          mkdir /tmp/tokens
+          echo "directories.tokendir = /tmp/tokens" > /tmp/softhsm2.conf
+      - name: Install Rust target
+        run: rustup target add ${{ matrix.target }}
+      - name: Test script
+        env:
+          TEST_PKCS11_MODULE: /usr/lib/softhsm/libsofthsm2.so
+          SOFTHSM2_CONF: /tmp/softhsm2.conf
+          TARGET: ${{ matrix.target }}
+          RUST_BACKTRACE: 1
+        run: ./ci.sh
 
   tests-kryoptic:
     name: Run tests against Kryoptic
@@ -58,27 +90,14 @@ jobs:
           RUST_BACKTRACE=1 cargo build --all-features &&
           RUST_BACKTRACE=1 cargo test
 
-
-  build-msrv:
-    name: MSRV - Execute CI script
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup Rust toolchain on MSRV
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: 1.66.0
-      - name: "Installs SoftHSM and execute tests"
-        uses: ./.github/actions/ci_script
-
   links:
     name: Check links
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Link Checker
-      uses: peter-evans/link-checker@v1
-      with:
-        args: -v -r *.md
-    - name: Fail if there were link errors
-      run: exit ${{ steps.lc.outputs.exit_code }}
+      - uses: actions/checkout@v4
+      - name: Link Checker
+        uses: peter-evans/link-checker@v1
+        with:
+          args: -v -r *.md
+      - name: Fail if there were link errors
+        run: exit ${{ steps.lc.outputs.exit_code }}

.github/workflows/ci.yml

@@ -5,10 +5,10 @@
 
 # Continuous Integration test script
 
-set -euf -o pipefail
+set -euxf -o pipefail
 
 pushd cryptoki-sys
-RUST_BACKTRACE=1 cargo build --features generate-bindings
+cargo build --features generate-bindings
 popd
 
 # check formatting before going through all the builds
@@ -19,22 +19,10 @@ if cargo clippy --version; then
 	cargo clippy --all-targets -- -D clippy::all -D clippy::cargo
 fi
 
-RUST_BACKTRACE=1 cargo build
-
-RUST_BACKTRACE=1 cargo build --all-features
-
-RUST_BACKTRACE=1 cargo build --target arm-unknown-linux-gnueabi
-RUST_BACKTRACE=1 cargo build --target armv7-unknown-linux-gnueabi
-RUST_BACKTRACE=1 cargo build --target armv7-unknown-linux-gnueabihf
-RUST_BACKTRACE=1 cargo build --target aarch64-unknown-linux-gnu
-RUST_BACKTRACE=1 cargo build --target i686-unknown-linux-gnu
-RUST_BACKTRACE=1 cargo build --target loongarch64-unknown-linux-gnu
-RUST_BACKTRACE=1 cargo build --target powerpc64-unknown-linux-gnu
-RUST_BACKTRACE=1 cargo build --target powerpc64le-unknown-linux-gnu
-RUST_BACKTRACE=1 cargo build --target riscv64gc-unknown-linux-gnu
-RUST_BACKTRACE=1 cargo build --target x86_64-pc-windows-msvc
-RUST_BACKTRACE=1 cargo build --target x86_64-apple-darwin
-RUST_BACKTRACE=1 cargo build --target aarch64-apple-darwin
-RUST_BACKTRACE=1 cargo build --target x86_64-unknown-freebsd
-
-RUST_BACKTRACE=1 cargo test
+cargo build
+
+cargo build --all-features
+
+cargo build --target "$TARGET"
+
+cargo test