Skip to content

Commit

Permalink
Upgrade cargo-deny (#1529)
Browse files Browse the repository at this point in the history
  • Loading branch information
svix-jplatte authored Nov 20, 2024
2 parents 7e68e1b + cc4d722 commit 33bc669
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 44 deletions.
17 changes: 0 additions & 17 deletions .github/workflows/bridge-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,20 +91,3 @@ jobs:
- name: Idle Test
working-directory: bridge
run: ./run-idle-test.sh


# deny-check:
# name: cargo-deny check
# runs-on: ubuntu-24.04
# continue-on-error: ${{ matrix.checks == 'advisories' }}
# strategy:
# matrix:
# checks:
# - advisories
# - bans licenses sources
# steps:
# - uses: actions/checkout@v4
# - uses: EmbarkStudios/cargo-deny-action@v1
# with:
# command: check ${{ matrix.checks }}
# arguments: --all-features --manifest-path axum/Cargo.toml
2 changes: 1 addition & 1 deletion .github/workflows/bridge-security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ jobs:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
- uses: EmbarkStudios/cargo-deny-action@v2
with:
manifest-path: bridge/Cargo.toml
2 changes: 1 addition & 1 deletion .github/workflows/rust-security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@ jobs:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
- uses: EmbarkStudios/cargo-deny-action@v2
with:
manifest-path: rust/Cargo.toml
15 changes: 0 additions & 15 deletions .github/workflows/server-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,18 +97,3 @@ jobs:

- name: Stop dependencies
run: docker compose -f "server/testing-docker-compose.yml" down
# deny-check:
# name: cargo-deny check
# runs-on: ubuntu-24.04
# continue-on-error: ${{ matrix.checks == 'advisories' }}
# strategy:
# matrix:
# checks:
# - advisories
# - bans licenses sources
# steps:
# - uses: actions/checkout@v4
# - uses: EmbarkStudios/cargo-deny-action@v1
# with:
# command: check ${{ matrix.checks }}
# arguments: --all-features --manifest-path axum/Cargo.toml
2 changes: 1 addition & 1 deletion .github/workflows/server-security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ jobs:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
- uses: EmbarkStudios/cargo-deny-action@v2
with:
manifest-path: server/Cargo.toml
13 changes: 4 additions & 9 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[graph]
targets = [
{ triple = "x86_64-pc-windows-gnu" },
{ triple = "x86_64-unknown-linux-musl" },
Expand All @@ -8,17 +9,15 @@ targets = [
[advisories]
db-path = "~/.cargo/advisory-db"
db-urls = ["https://github.com/rustsec/advisory-db"]
vulnerability = "deny"
unmaintained = "warn"
yanked = "deny"
notice = "warn"
ignore = [
# TODO: Update dependencies that use rsa crate
"RUSTSEC-2023-0071"
"RUSTSEC-2023-0071",
# TODO: Wait for dependencies to upgrade off of proc-macro-error
"RUSTSEC-2024-0370",
]

[licenses]
unlicensed = "deny"
allow = [
"Apache-2.0",
"BSD-2-Clause",
Expand All @@ -31,10 +30,6 @@ allow = [
"Unicode-DFS-2016",
"CC0-1.0",
]
deny = []
copyleft = "deny"
allow-osi-fsf-free = "neither"
default = "deny"
confidence-threshold = 0.8
exceptions = [
#{ allow = ["Zlib"], name = "adler32", version = "*" },
Expand Down

0 comments on commit 33bc669

Please sign in to comment.