diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fab78851..935b6085 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: run: cargo fmt --all -- --check lints: - name: Check lints + name: Check lints with clippy runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -134,10 +134,8 @@ jobs: env: TEST_PKCS11_MODULE: /usr/lib/softhsm/libsofthsm2.so SOFTHSM2_CONF: /tmp/softhsm2.conf - TARGET: ${{ matrix.target }} - RUST_BACKTRACE: 1 RUSTFLAGS: "-D warnings" - run: ./ci.sh + run: RUST_BACKTRACE=1 cargo test --target ${{ matrix.target }} build-windows: name: Build on Windows diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ce66695a..923ad9a2 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -28,47 +28,6 @@ jobs: - name: Execute cargo udeps run: cargo +nightly udeps - build: - name: Execute builds with updated dependencies - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Setup Rust toolchain - uses: actions-rs/toolchain@v1 - with: - toolchain: stable - - - 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 targets - run: | - rustup target add armv7-unknown-linux-gnueabi && - rustup target add armv7-unknown-linux-gnueabihf && - rustup target add arm-unknown-linux-gnueabi && - rustup target add aarch64-unknown-linux-gnu && - rustup target add i686-unknown-linux-gnu && - rustup target add powerpc64-unknown-linux-gnu && - rustup target add powerpc64le-unknown-linux-gnu && - rustup target add x86_64-pc-windows-msvc && - rustup target add x86_64-apple-darwin && - rustup target add aarch64-apple-darwin && - rustup target add x86_64-unknown-freebsd - rustup target add loongarch64-unknown-linux-gnu - rustup target add riscv64gc-unknown-linux-gnu - - - name: Test script - env: - TEST_PKCS11_MODULE: /usr/lib/softhsm/libsofthsm2.so - SOFTHSM2_CONF: /tmp/softhsm2.conf - run: | - rm Cargo.lock - ./ci.sh - audit: name: Check for crates with security vulnerabilities runs-on: ubuntu-latest diff --git a/ci.sh b/ci.sh deleted file mode 100755 index 029cd813..00000000 --- a/ci.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2021 Contributors to the Parsec project. -# SPDX-License-Identifier: Apache-2.0 - -# Continuous Integration test script - -set -euxf -o pipefail - -pushd cryptoki-sys -cargo build --features generate-bindings -popd - -cargo test --target "$TARGET"