Skip to content
This repository was archived by the owner on Nov 1, 2023. It is now read-only.

Commit bb410e1

Browse files
authored
Move cargo-audit functionality to deny.toml
1 parent ceba7a7 commit bb410e1

File tree

6 files changed

+14
-10
lines changed

6 files changed

+14
-10
lines changed

.devcontainer/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -eux
55
# Note that this script runs as user 'vscode' during devcontainer setup.
66

77
# Rust global tools, needed to run CI scripts
8-
"$HOME/.cargo/bin/cargo" install cargo-audit cargo-[email protected] cargo-llvm-cov cargo-deny
8+
"$HOME/.cargo/bin/cargo" install [email protected] cargo-llvm-cov cargo-deny
99
"$HOME/.cargo/bin/rustup" component add llvm-tools-preview
1010

1111
# NPM global tools

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
CARGO_TERM_COLOR: always
1919
SCCACHE_DIR: ${{github.workspace}}/sccache/
2020
SCCACHE_CACHE_SIZE: 1G
21-
ACTIONS_CACHE_KEY_DATE: 2022-11-21-01
21+
ACTIONS_CACHE_KEY_DATE: 2022-11-21-02
2222
CI: true
2323
DOTNET_VERSION: 7.0.x
2424

src/ci/agent.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ cd src/agent
3737

3838
rustc --version
3939
cargo --version
40-
cargo audit --version
40+
cargo deny --version
4141
cargo clippy --version
4242
cargo fmt --version
4343
cargo license --version
@@ -48,9 +48,6 @@ if [ X${CARGO_INCREMENTAL} == X ]; then
4848
fi
4949

5050
cargo fmt -- --check
51-
# RUSTSEC-2022-0048: xml-rs is unmaintained
52-
# RUSTSEC-2021-0139: ansi_term is unmaintained
53-
cargo audit --deny warnings --deny unmaintained --deny unsound --deny yanked --ignore RUSTSEC-2022-0048 --ignore RUSTSEC-2021-0139
5451
cargo deny -L error check
5552
cargo license -j > data/licenses.json
5653
cargo build --release --locked

src/ci/proxy.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ mkdir -p artifacts/proxy
1212
cd src/proxy-manager
1313
cargo fmt -- --check
1414
cargo clippy --release --all-targets -- -D warnings
15-
# RUSTSEC-2022-0048: xml-rs is unmaintained
16-
# RUSTSEC-2021-0139: ansi_term is unmaintained
17-
cargo audit --deny warnings --deny unmaintained --deny unsound --deny yanked --ignore RUSTSEC-2022-0048 --ignore RUSTSEC-2021-0139
1815
cargo deny -L error check
1916
cargo license -j > data/licenses.json
2017
cargo build --release --locked

src/ci/rust-prereqs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fi
1111
# sccache --start-server
1212
# export RUSTC_WRAPPER=$(which sccache)
1313

14-
cargo install cargo-audit cargo-llvm-cov cargo-deny
14+
cargo install cargo-llvm-cov cargo-deny
1515

1616
if ! cargo license --help; then
1717
cargo install [email protected]

src/deny.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,16 @@ allow = [
99
"Zlib",
1010
]
1111

12+
[advisories]
13+
vulnerability = "deny"
14+
unmaintained = "deny"
15+
unsound = "deny"
16+
yanked = "deny"
17+
ignore = [
18+
"RUSTSEC-2022-0048", # xml-rs is unmaintained
19+
"RUSTSEC-2021-0139", # ansi_term is unmaintained
20+
]
21+
1222
[bans]
1323

1424
# disallow rustls; we must use OpenSSL

0 commit comments

Comments
 (0)