diff --git a/.buildkite/hooks/post-checkout b/.buildkite/hooks/post-checkout index 2e40938cd9..1a680832ce 100644 --- a/.buildkite/hooks/post-checkout +++ b/.buildkite/hooks/post-checkout @@ -33,3 +33,10 @@ source ci/env.sh kill -9 "$victim" || true done ) + +# HACK: These are in our docker images, need to be removed from CARGO_HOME +# because we try to cache downloads across builds with CARGO_HOME +# cargo lacks a facility for "system" tooling, always tries CARGO_HOME first +cargo uninstall cargo-audit || true +cargo uninstall svgbob_cli || true +cargo uninstall mdbook || true diff --git a/ci/test-checks.sh b/ci/test-checks.sh index dabeb95d8e..8b28601976 100755 --- a/ci/test-checks.sh +++ b/ci/test-checks.sh @@ -13,9 +13,9 @@ export RUSTFLAGS="-D warnings" do_bpf_check() { _ cargo +"$rust_stable" fmt --all -- --check _ cargo +"$rust_nightly" test --all - _ cargo +"$rust_nightly" clippy --all -- --version + _ cargo +"$rust_nightly" clippy --version _ cargo +"$rust_nightly" clippy --all -- --deny=warnings -# _ cargo +"$rust_stable" audit + _ cargo +"$rust_stable" audit } ( @@ -40,9 +40,10 @@ do_bpf_check() { ) _ cargo +"$rust_stable" fmt --all -- --check -_ cargo +"$rust_stable" clippy --all -- --version +_ cargo +"$rust_stable" clippy --version _ cargo +"$rust_stable" clippy --all -- --deny=warnings -#_ cargo +"$rust_stable" audit +_ cargo +"$rust_stable" audit --version +_ cargo +"$rust_stable" audit --ignore RUSTSEC-2019-0011 # https://github.com/solana-labs/solana/issues/5207 _ ci/nits.sh _ ci/order-crates-for-publishing.py _ book/build.sh