Skip to content

Commit 6104f83

Browse files
bors[bot]Nemo157
andauthored
Merge #147
147: Migrate from `cargo audit` to `cargo deny` r=Nemo157 a=Nemo157 Co-authored-by: Wim Looman <[email protected]>
2 parents 02dfd88 + cf23c9b commit 6104f83

File tree

6 files changed

+65
-57
lines changed

6 files changed

+65
-57
lines changed

.github/workflows/audit.yml

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

.github/workflows/deny.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: deny
2+
3+
env:
4+
RUST_BACKTRACE: 1
5+
6+
jobs:
7+
cargo-deny-advisories:
8+
name: cargo deny advisories
9+
runs-on: ubuntu-latest
10+
continue-on-error: true
11+
steps:
12+
- uses: actions/checkout@v2
13+
- uses: EmbarkStudios/cargo-deny-action@v1
14+
with:
15+
command: check advisories
16+
17+
cargo-deny-licenses:
18+
name: cargo deny bans licenses sources
19+
runs-on: ubuntu-latest
20+
steps:
21+
- uses: actions/checkout@v2
22+
- uses: EmbarkStudios/cargo-deny-action@v1
23+
with:
24+
command: check bans licenses sources
25+
26+
on:
27+
push:
28+
branches: [staging, trying]
29+
pull_request:
30+
branches: [prīmum]

Cargo.lock

Lines changed: 2 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ tokio-util-03 = { package = "tokio-util", version = "0.3.0", default-features =
6868
tokio-util-04 = { package = "tokio-util", version = "0.4.0", default-features = false, features = ["io"] }
6969
tokio-util-05 = { package = "tokio-util", version = "0.5.0", default-features = false, features = ["io"] }
7070
tokio-util-06 = { package = "tokio-util", version = "0.6.0", default-features = false, features = ["io"] }
71-
futures_codec = { version = "0.4.1", default-features = false }
7271

7372
[[test]]
7473
name = "brotli"

bors.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ status = [
1010
"cargo hack check --all-targets --feature-powerset",
1111
"cargo fmt --check",
1212
"cargo clippy",
13-
# "cargo audit",
13+
"cargo deny bans licenses sources",
1414
"cargo doc --cfg docsrs",
1515
]
1616
delete_merged_branches = true

deny.toml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
[advisories]
2+
ignore = [
3+
# tokio 0.2 and 0.3 are both perma-vulnerable to these two advisories,
4+
# will be removed once support for them is dropped
5+
"RUSTSEC-2021-0072",
6+
"RUSTSEC-2021-0124",
7+
]
8+
9+
[licenses]
10+
unlicensed = "deny"
11+
allow = [
12+
"MIT",
13+
"Apache-2.0",
14+
"BSD-3-Clause",
15+
]
16+
default = "deny"
17+
18+
[bans]
19+
multiple-versions = "warn"
20+
skip = [
21+
# Used in the stream migration docs
22+
{ name = "tokio-util", version = "0.3" },
23+
{ name = "tokio-util", version = "0.4" },
24+
{ name = "tokio-util", version = "0.5" },
25+
{ name = "tokio-util", version = "0.6" },
26+
]
27+
skip-tree = [
28+
{ name = "tokio", version = "0.2" },
29+
{ name = "tokio", version = "0.3" },
30+
{ name = "proptest", version = "1.0" },
31+
{ name = "proptest-derive", version = "0.3" },
32+
]

0 commit comments

Comments
 (0)