Skip to content

Commit 970aeeb

Browse files
author
FreeSynergy
committed
fix(ci): resolve all CI failures
- deny.toml: remove deprecated [licenses].deny key (cargo-deny 0.19) - deny.toml: ignore RUSTSEC-2023-0071 (rsa Marvin Attack, no upstream patch) - ci: add fs-libs checkout step for CLI build job - cargo update: quinn-proto 0.11.13->0.11.14, rustls-webpki 0.103.9->0.103.10 - remove unused thiserror dep from fs-builder, fs-deploy, fs-s3
1 parent 909f0d8 commit 970aeeb

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ jobs:
2020
steps:
2121
- uses: actions/checkout@v4
2222

23+
- name: Checkout fs-libs
24+
run: git clone --depth=1 "https://x-access-token:${{ secrets.FS_LIBS_TOKEN }}@github.com/FreeSynergy/fs-libs.git" "${{ github.workspace }}/../fs-libs"
25+
2326
- uses: dtolnay/rust-toolchain@stable
2427
with:
2528
components: rustfmt, clippy

cli/Cargo.lock

Lines changed: 4 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cli/crates/fs-builder/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ serde_json = { workspace = true }
1919
serde_yml = { workspace = true }
2020
toml = { workspace = true }
2121
anyhow = { workspace = true }
22-
thiserror = { workspace = true }
2322
clap = { workspace = true }
2423
tracing = { workspace = true }
2524
tracing-subscriber = { workspace = true }

cli/crates/fs-deploy/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ serde_json = { workspace = true }
2121
toml = { workspace = true }
2222
indexmap = { workspace = true }
2323
anyhow = { workspace = true }
24-
thiserror = { workspace = true }
2524
tokio = { workspace = true }
2625
reqwest = { workspace = true }
2726
tracing = { workspace = true }

cli/crates/fs-s3/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ toml = { workspace = true }
3434

3535
# Error handling
3636
anyhow = { workspace = true }
37-
thiserror = { workspace = true }
3837

3938
# Logging
4039
tracing = { workspace = true }

deny.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ exclude-dev = false
77
# Deny crates with known security vulnerabilities
88
version = 2
99
yanked = "deny"
10+
ignore = [
11+
# rsa: Marvin Attack timing sidechannel — no upstream patch available yet
12+
# Used transitively via russh-keys. Acceptable for internal SSH auth.
13+
"RUSTSEC-2023-0071",
14+
]
1015

1116
[licenses]
1217
version = 2
@@ -23,7 +28,6 @@ allow = [
2328
"OpenSSL",
2429
"Zlib",
2530
]
26-
deny = []
2731
# Ring has a non-standard license — allow it explicitly
2832
exceptions = [
2933
{ allow = ["ISC", "MIT", "OpenSSL"], name = "ring" },

0 commit comments

Comments
 (0)