Skip to content

Commit bd31b4a

Browse files
committed
Auto merge of #14628 - weihanglo:cargo-deny, r=epage
chore(deps): update embarkstudios/cargo-deny-action action to v2 ### What does this PR try to resolve? See * #14625 * https://github.com/EmbarkStudios/cargo-deny-action/releases for the full list of changes. Notably changes that would affect this repository: * `[advisories.unmaintained]` and `[advisories.notice]` have become deny-by-default and these fields are all removed. Exceptions can only be added to specific advisory via [`ignore`](https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html#the-ignore-field-optional) ### How should we test and review this PR? CI passes.
2 parents 2fd7321 + 96ef4e4 commit bd31b4a

File tree

2 files changed

+1
-32
lines changed

2 files changed

+1
-32
lines changed

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- bans licenses sources
2323
steps:
2424
- uses: actions/checkout@v4
25-
- uses: EmbarkStudios/cargo-deny-action@v1
25+
- uses: EmbarkStudios/cargo-deny-action@v2
2626
# Prevent sudden announcement of a new advisory from failing ci:
2727
continue-on-error: ${{ matrix.checks == 'advisories' }}
2828
with:

deny.toml

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -61,16 +61,7 @@ feature-depth = 1
6161
db-path = "~/.cargo/advisory-db"
6262
# The url(s) of the advisory databases to use
6363
db-urls = ["https://github.com/rustsec/advisory-db"]
64-
# The lint level for security vulnerabilities
65-
vulnerability = "deny"
66-
# The lint level for unmaintained crates
67-
unmaintained = "warn"
68-
# The lint level for crates that have been yanked from their source registry
6964
yanked = "warn"
70-
# The lint level for crates with security notices. Note that as of
71-
# 2019-12-17 there are no security notice advisories in
72-
# https://github.com/rustsec/advisory-db
73-
notice = "warn"
7465
# A list of advisory IDs to ignore. Note that ignored advisories will still
7566
# output a note when they are encountered.
7667
ignore = [
@@ -96,8 +87,6 @@ ignore = [
9687
# More documentation for the licenses section can be found here:
9788
# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html
9889
[licenses]
99-
# The lint level for crates which do not have a detectable license
100-
unlicensed = "deny"
10190
# List of explicitly allowed licenses
10291
# See https://spdx.org/licenses/ for list of possible licenses
10392
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
@@ -111,26 +100,6 @@ allow = [
111100
"CC0-1.0",
112101
"ISC",
113102
]
114-
# List of explicitly disallowed licenses
115-
# See https://spdx.org/licenses/ for list of possible licenses
116-
# [possible values: any SPDX 3.11 short identifier (+ optional exception)].
117-
deny = [
118-
#"Nokia",
119-
]
120-
# Lint level for licenses considered copyleft
121-
copyleft = "warn"
122-
# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses
123-
# * both - The license will be approved if it is both OSI-approved *AND* FSF
124-
# * either - The license will be approved if it is either OSI-approved *OR* FSF
125-
# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF
126-
# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved
127-
# * neither - This predicate is ignored and the default lint level is used
128-
allow-osi-fsf-free = "neither"
129-
# Lint level used when no other predicates are matched
130-
# 1. License isn't in the allow or deny lists
131-
# 2. License isn't copyleft
132-
# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither"
133-
default = "deny"
134103
# The confidence threshold for detecting a license from license text.
135104
# The higher the value, the more closely the license text must be to the
136105
# canonical license text of a valid SPDX license file.

0 commit comments

Comments
 (0)