CI: Split cargo-audit off to its own buildkite job run with cargo 1.46.0

Needed to support new cargo audit advisory format https://github.com/RustSec/advisory-db/issues/414
This commit is contained in:
Trent Nelson
2020-10-02 12:24:05 -06:00
committed by Michael Vines
parent f7a87291c3
commit 7e57c5cefe
4 changed files with 24 additions and 2 deletions

View File

@ -15,6 +15,12 @@ steps:
- wait - wait
- command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_audit_docker_image ci/test-audit.sh"
name: "audit"
timeout_in_minutes: 20
- wait
- command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_nightly_docker_image ci/test-checks.sh" - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_nightly_docker_image ci/test-checks.sh"
name: "checks" name: "checks"
timeout_in_minutes: 20 timeout_in_minutes: 20

View File

@ -34,6 +34,9 @@ export rust_stable_docker_image=solanalabs/rust:"$stable_version"
export rust_nightly=nightly-"$nightly_version" export rust_nightly=nightly-"$nightly_version"
export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version" export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"
export rust_audit="1.46.0"
export rust_audit_docker_image=solanalabs/rust-nightly:2020-08-17
[[ -z $1 ]] || ( [[ -z $1 ]] || (
rustup_install() { rustup_install() {
@ -47,6 +50,9 @@ export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"
set -e set -e
cd "$(dirname "${BASH_SOURCE[0]}")" cd "$(dirname "${BASH_SOURCE[0]}")"
case $1 in case $1 in
audit)
rustup_install "$rust_audit"
;;
stable) stable)
rustup_install "$rust_stable" rustup_install "$rust_stable"
;; ;;
@ -56,6 +62,7 @@ export rust_nightly_docker_image=solanalabs/rust-nightly:"$nightly_version"
all) all)
rustup_install "$rust_stable" rustup_install "$rust_stable"
rustup_install "$rust_nightly" rustup_install "$rust_nightly"
rustup_install "$rust_audit"
;; ;;
*) *)
echo "Note: ignoring unknown argument: $1" echo "Note: ignoring unknown argument: $1"

11
ci/test-audit.sh Executable file
View File

@ -0,0 +1,11 @@
#!/usr/bin/env bash
set -e
source ci/_
source ci/rust-version.sh audit
export RUST_BACKTRACE=1
export RUSTFLAGS="-D warnings"
_ cargo +"$rust_audit" audit --version
_ scripts/cargo-for-all-lock-files.sh +"$rust_audit" audit --ignore RUSTSEC-2020-0002 --ignore RUSTSEC-2020-0008

View File

@ -31,8 +31,6 @@ _ cargo +"$rust_stable" fmt --all -- --check
_ cargo +"$rust_stable" clippy --version _ cargo +"$rust_stable" clippy --version
_ cargo +"$rust_stable" clippy --workspace -- --deny=warnings _ cargo +"$rust_stable" clippy --workspace -- --deny=warnings
_ cargo +"$rust_stable" audit --version
_ scripts/cargo-for-all-lock-files.sh +"$rust_stable" audit --ignore RUSTSEC-2020-0002 --ignore RUSTSEC-2020-0008
_ ci/order-crates-for-publishing.py _ ci/order-crates-for-publishing.py
{ {