Skip to content

Commit 33bc669

Browse files
authored
Upgrade cargo-deny (#1529)
2 parents 7e68e1b + cc4d722 commit 33bc669

File tree

6 files changed

+7
-44
lines changed

6 files changed

+7
-44
lines changed

.github/workflows/bridge-ci.yml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -91,20 +91,3 @@ jobs:
9191
- name: Idle Test
9292
working-directory: bridge
9393
run: ./run-idle-test.sh
94-
95-
96-
# deny-check:
97-
# name: cargo-deny check
98-
# runs-on: ubuntu-24.04
99-
# continue-on-error: ${{ matrix.checks == 'advisories' }}
100-
# strategy:
101-
# matrix:
102-
# checks:
103-
# - advisories
104-
# - bans licenses sources
105-
# steps:
106-
# - uses: actions/checkout@v4
107-
# - uses: EmbarkStudios/cargo-deny-action@v1
108-
# with:
109-
# command: check ${{ matrix.checks }}
110-
# arguments: --all-features --manifest-path axum/Cargo.toml

.github/workflows/bridge-security.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ jobs:
2424
runs-on: ubuntu-24.04
2525
steps:
2626
- uses: actions/checkout@v4
27-
- uses: EmbarkStudios/cargo-deny-action@v1
27+
- uses: EmbarkStudios/cargo-deny-action@v2
2828
with:
2929
manifest-path: bridge/Cargo.toml

.github/workflows/rust-security.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ jobs:
1919
runs-on: ubuntu-24.04
2020
steps:
2121
- uses: actions/checkout@v4
22-
- uses: EmbarkStudios/cargo-deny-action@v1
22+
- uses: EmbarkStudios/cargo-deny-action@v2
2323
with:
2424
manifest-path: rust/Cargo.toml

.github/workflows/server-ci.yml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,3 @@ jobs:
9797

9898
- name: Stop dependencies
9999
run: docker compose -f "server/testing-docker-compose.yml" down
100-
# deny-check:
101-
# name: cargo-deny check
102-
# runs-on: ubuntu-24.04
103-
# continue-on-error: ${{ matrix.checks == 'advisories' }}
104-
# strategy:
105-
# matrix:
106-
# checks:
107-
# - advisories
108-
# - bans licenses sources
109-
# steps:
110-
# - uses: actions/checkout@v4
111-
# - uses: EmbarkStudios/cargo-deny-action@v1
112-
# with:
113-
# command: check ${{ matrix.checks }}
114-
# arguments: --all-features --manifest-path axum/Cargo.toml

.github/workflows/server-security.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ jobs:
2424
runs-on: ubuntu-24.04
2525
steps:
2626
- uses: actions/checkout@v4
27-
- uses: EmbarkStudios/cargo-deny-action@v1
27+
- uses: EmbarkStudios/cargo-deny-action@v2
2828
with:
2929
manifest-path: server/Cargo.toml

deny.toml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
[graph]
12
targets = [
23
{ triple = "x86_64-pc-windows-gnu" },
34
{ triple = "x86_64-unknown-linux-musl" },
@@ -8,17 +9,15 @@ targets = [
89
[advisories]
910
db-path = "~/.cargo/advisory-db"
1011
db-urls = ["https://github.com/rustsec/advisory-db"]
11-
vulnerability = "deny"
12-
unmaintained = "warn"
1312
yanked = "deny"
14-
notice = "warn"
1513
ignore = [
1614
# TODO: Update dependencies that use rsa crate
17-
"RUSTSEC-2023-0071"
15+
"RUSTSEC-2023-0071",
16+
# TODO: Wait for dependencies to upgrade off of proc-macro-error
17+
"RUSTSEC-2024-0370",
1818
]
1919

2020
[licenses]
21-
unlicensed = "deny"
2221
allow = [
2322
"Apache-2.0",
2423
"BSD-2-Clause",
@@ -31,10 +30,6 @@ allow = [
3130
"Unicode-DFS-2016",
3231
"CC0-1.0",
3332
]
34-
deny = []
35-
copyleft = "deny"
36-
allow-osi-fsf-free = "neither"
37-
default = "deny"
3833
confidence-threshold = 0.8
3934
exceptions = [
4035
#{ allow = ["Zlib"], name = "adler32", version = "*" },

0 commit comments

Comments
 (0)