Skip to content

Commit 1d47788

Browse files
committed
Remove ci.sh script to run all from workflow
The ci.sh script was used in the main script, but only to execute cargo test. It was also used in the nightly workflow but it's not needed since the same steps are run in the merge workflow. Signed-off-by: Hugues de Valon <hugues.de-valon@einride.tech>
1 parent 227f913 commit 1d47788

File tree

3 files changed

+2
-59
lines changed

3 files changed

+2
-59
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
run: cargo fmt --all -- --check
2323

2424
lints:
25-
name: Check lints
25+
name: Check lints with clippy
2626
runs-on: ubuntu-latest
2727
steps:
2828
- uses: actions/checkout@v4
@@ -134,10 +134,8 @@ jobs:
134134
env:
135135
TEST_PKCS11_MODULE: /usr/lib/softhsm/libsofthsm2.so
136136
SOFTHSM2_CONF: /tmp/softhsm2.conf
137-
TARGET: ${{ matrix.target }}
138-
RUST_BACKTRACE: 1
139137
RUSTFLAGS: "-D warnings"
140-
run: ./ci.sh
138+
run: RUST_BACKTRACE=1 cargo test --target ${{ matrix.target }}
141139

142140
build-windows:
143141
name: Build on Windows

.github/workflows/nightly.yml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -28,47 +28,6 @@ jobs:
2828
- name: Execute cargo udeps
2929
run: cargo +nightly udeps
3030

31-
build:
32-
name: Execute builds with updated dependencies
33-
runs-on: ubuntu-latest
34-
steps:
35-
- uses: actions/checkout@v4
36-
- name: Setup Rust toolchain
37-
uses: actions-rs/toolchain@v1
38-
with:
39-
toolchain: stable
40-
41-
- name: Install SoftHSM
42-
run: |
43-
sudo apt-get update -y -qq &&
44-
sudo apt-get install -y -qq libsofthsm2 &&
45-
mkdir /tmp/tokens
46-
echo "directories.tokendir = /tmp/tokens" > /tmp/softhsm2.conf
47-
48-
- name: Install Rust targets
49-
run: |
50-
rustup target add armv7-unknown-linux-gnueabi &&
51-
rustup target add armv7-unknown-linux-gnueabihf &&
52-
rustup target add arm-unknown-linux-gnueabi &&
53-
rustup target add aarch64-unknown-linux-gnu &&
54-
rustup target add i686-unknown-linux-gnu &&
55-
rustup target add powerpc64-unknown-linux-gnu &&
56-
rustup target add powerpc64le-unknown-linux-gnu &&
57-
rustup target add x86_64-pc-windows-msvc &&
58-
rustup target add x86_64-apple-darwin &&
59-
rustup target add aarch64-apple-darwin &&
60-
rustup target add x86_64-unknown-freebsd
61-
rustup target add loongarch64-unknown-linux-gnu
62-
rustup target add riscv64gc-unknown-linux-gnu
63-
64-
- name: Test script
65-
env:
66-
TEST_PKCS11_MODULE: /usr/lib/softhsm/libsofthsm2.so
67-
SOFTHSM2_CONF: /tmp/softhsm2.conf
68-
run: |
69-
rm Cargo.lock
70-
./ci.sh
71-
7231
audit:
7332
name: Check for crates with security vulnerabilities
7433
runs-on: ubuntu-latest

ci.sh

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)