Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Commit 7e57c5c

Browse files
t-nelsonmvines
authored andcommitted
CI: Split cargo-audit off to its own buildkite job run with cargo 1.46.0
Needed to support new cargo audit advisory format rustsec/advisory-db#414
1 parent f7a8729 commit 7e57c5c

File tree

4 files changed

+24
-2
lines changed

4 files changed

+24
-2
lines changed

ci/buildkite.yml

+6
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ steps:
1515

1616
- wait
1717

18+
- command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_audit_docker_image ci/test-audit.sh"
19+
name: "audit"
20+
timeout_in_minutes: 20
21+
22+
- wait
23+
1824
- command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_nightly_docker_image ci/test-checks.sh"
1925
name: "checks"
2026
timeout_in_minutes: 20

ci/rust-version.sh

+7
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ export rust_stable_docker_image=solanalabs/rust:"$stable_version"
3434
export rust_nightly=nightly-"$nightly_version"
3535
export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"
3636

37+
export rust_audit="1.46.0"
38+
export rust_audit_docker_image=solanalabs/rust-nightly:2020-08-17
39+
3740
[[ -z $1 ]] || (
3841

3942
rustup_install() {
@@ -47,6 +50,9 @@ export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"
4750
set -e
4851
cd "$(dirname "${BASH_SOURCE[0]}")"
4952
case $1 in
53+
audit)
54+
rustup_install "$rust_audit"
55+
;;
5056
stable)
5157
rustup_install "$rust_stable"
5258
;;
@@ -56,6 +62,7 @@ export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"
5662
all)
5763
rustup_install "$rust_stable"
5864
rustup_install "$rust_nightly"
65+
rustup_install "$rust_audit"
5966
;;
6067
*)
6168
echo "Note: ignoring unknown argument: $1"

ci/test-audit.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/env bash
2+
set -e
3+
4+
source ci/_
5+
source ci/rust-version.sh audit
6+
7+
export RUST_BACKTRACE=1
8+
export RUSTFLAGS="-D warnings"
9+
10+
_ cargo +"$rust_audit" audit --version
11+
_ scripts/cargo-for-all-lock-files.sh +"$rust_audit" audit --ignore RUSTSEC-2020-0002 --ignore RUSTSEC-2020-0008

ci/test-checks.sh

-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ _ cargo +"$rust_stable" fmt --all -- --check
3131
_ cargo +"$rust_stable" clippy --version
3232
_ cargo +"$rust_stable" clippy --workspace -- --deny=warnings
3333

34-
_ cargo +"$rust_stable" audit --version
35-
_ scripts/cargo-for-all-lock-files.sh +"$rust_stable" audit --ignore RUSTSEC-2020-0002 --ignore RUSTSEC-2020-0008
3634
_ ci/order-crates-for-publishing.py
3735

3836
{

0 commit comments

Comments
 (0)