Skip to content

Commit b55a5d9

Browse files
committed
deny: Sync with rpm-ostree
We should really have a more centrally-maintained `cargo-deny` configuration. I'd argue to maintain it here in bootc to start, but this will be a common thing for other projects in github.com/containers and elsewhere. Anyways, this needed updating for the new Unicode-3.0 license in some updated unicode crates that I saw in rpm-ostree. While we're here, quiet the duplicate crate warning in the CI job, as it's just noise. Keep it when running locally so we have some visibility if we care about it. Signed-off-by: Colin Walters <[email protected]>
1 parent 82760fe commit b55a5d9

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- uses: EmbarkStudios/cargo-deny-action@v2
5959
with:
6060
log-level: warn
61-
command: check bans sources licenses
61+
command: check -A duplicate bans sources licenses
6262
install-tests:
6363
if: ${{ !contains(github.event.pull_request.labels.*.name, 'control/skip-ci') }}
6464
name: "Test install"

deny.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
[licenses]
2-
allow = ["Apache-2.0", "Apache-2.0 WITH LLVM-exception", "MIT", "BSD-3-Clause", "BSD-2-Clause", "Unicode-DFS-2016"]
2+
allow = ["Apache-2.0", "Apache-2.0 WITH LLVM-exception", "MIT",
3+
"BSD-3-Clause", "BSD-2-Clause", "Zlib",
4+
"Unlicense", "CC0-1.0",
5+
"Unicode-DFS-2016", "Unicode-3.0"]
6+
private = { ignore = true }
37

48
[[bans.deny]]
59
# We want to require FIPS validation downstream, so we use openssl
@@ -8,6 +12,4 @@ name = "ring"
812
[sources]
913
unknown-registry = "deny"
1014
unknown-git = "deny"
11-
allow-git = [
12-
"https://github.com/ostreedev/ostree-rs-ext"
13-
]
15+
allow-git = []

0 commit comments

Comments
 (0)