Skip to content

Commit 455301e

Browse files
authored
Merge pull request #1035 from cgwalters/deny-sync
deny: Sync with rpm-ostree
2 parents 82760fe + b55a5d9 commit 455301e

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

Diff for: .github/workflows/ci.yml

+1-1
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"

Diff for: deny.toml

+6-4
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)