Skip to content

Commit

Permalink
Merge #147
Browse files Browse the repository at this point in the history
147: Migrate from `cargo audit` to `cargo deny` r=Nemo157 a=Nemo157



Co-authored-by: Wim Looman <git@nemo157.com>
  • Loading branch information
bors[bot] and Nemo157 committed May 11, 2022
2 parents 02dfd88 + cf23c9b commit 6104f83
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 57 deletions.
20 changes: 0 additions & 20 deletions .github/workflows/audit.yml

This file was deleted.

30 changes: 30 additions & 0 deletions .github/workflows/deny.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: deny

env:
RUST_BACKTRACE: 1

jobs:
cargo-deny-advisories:
name: cargo deny advisories
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v2
- uses: EmbarkStudios/cargo-deny-action@v1
with:
command: check advisories

cargo-deny-licenses:
name: cargo deny bans licenses sources
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: EmbarkStudios/cargo-deny-action@v1
with:
command: check bans licenses sources

on:
push:
branches: [staging, trying]
pull_request:
branches: [prīmum]
37 changes: 2 additions & 35 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ tokio-util-03 = { package = "tokio-util", version = "0.3.0", default-features =
tokio-util-04 = { package = "tokio-util", version = "0.4.0", default-features = false, features = ["io"] }
tokio-util-05 = { package = "tokio-util", version = "0.5.0", default-features = false, features = ["io"] }
tokio-util-06 = { package = "tokio-util", version = "0.6.0", default-features = false, features = ["io"] }
futures_codec = { version = "0.4.1", default-features = false }

[[test]]
name = "brotli"
Expand Down
2 changes: 1 addition & 1 deletion bors.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ status = [
"cargo hack check --all-targets --feature-powerset",
"cargo fmt --check",
"cargo clippy",
# "cargo audit",
"cargo deny bans licenses sources",
"cargo doc --cfg docsrs",
]
delete_merged_branches = true
32 changes: 32 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
[advisories]
ignore = [
# tokio 0.2 and 0.3 are both perma-vulnerable to these two advisories,
# will be removed once support for them is dropped
"RUSTSEC-2021-0072",
"RUSTSEC-2021-0124",
]

[licenses]
unlicensed = "deny"
allow = [
"MIT",
"Apache-2.0",
"BSD-3-Clause",
]
default = "deny"

[bans]
multiple-versions = "warn"
skip = [
# Used in the stream migration docs
{ name = "tokio-util", version = "0.3" },
{ name = "tokio-util", version = "0.4" },
{ name = "tokio-util", version = "0.5" },
{ name = "tokio-util", version = "0.6" },
]
skip-tree = [
{ name = "tokio", version = "0.2" },
{ name = "tokio", version = "0.3" },
{ name = "proptest", version = "1.0" },
{ name = "proptest-derive", version = "0.3" },
]

0 comments on commit 6104f83

Please sign in to comment.