Skip to content

Commit 9fd334c

Browse files
authored
chore(deps): bisync yanked all releases, pending gix update to fix (#524)
* chore(deps): depsup * fix(deps): pin gix to 0.85.0 to avoid yanked bisync dependency gix-protocol 0.64.0+ (pulled in by gix 0.86.0+) depends on bisync ^0.3.0, and every published version of bisync has been yanked by its author (permanently, as a supply-chain-risk precaution). This makes gix >=0.86.0 unresolvable during a fresh `cargo update`, which is exactly what the audit-check workflow does, so it now fails on both this branch and master. gix 0.85.0 depends on gix-protocol ^0.63.0, which predates the bisync dependency, so pinning back to it avoids the yanked crate entirely until upstream gitoxide ships a fix. * chore(deps): gix to 0.87.1 to fix bisync yank, deps pulled to top level to ease maintenance.
1 parent 93a4b21 commit 9fd334c

8 files changed

Lines changed: 43 additions & 33 deletions

File tree

Cargo.toml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,37 @@ members = [
1414
[workspace.dependencies]
1515
anyhow = "1.0.104"
1616
bon = "3.9.3"
17-
gix = { version = "0.86.0", default-features = false, features = [
17+
cargo_metadata = "0.23.1"
18+
console = "0.16.4"
19+
convert_case = "0.11.0"
20+
git2-rs = { version = "0.21.0", package = "git2", default-features = false }
21+
gix = { version = "0.87.1", default-features = false, features = [
1822
"revision",
1923
"worktree-mutation",
2024
"blocking-network-client",
2125
"sha1",
2226
] }
2327
rand = { version = "0.10.2" }
2428
regex = { version = "1.13.1" }
29+
rkyv = { version = "0.8.18", features = ["std"] }
30+
rustc_version = "0.4.1"
2531
rustversion = "1.0.23"
32+
serde = { version = "1.0.229", features = ["derive"] }
2633
serde_json = "1.0.151"
2734
serial_test = "4.0.1"
35+
sysinfo = "0.39.6"
2836
temp-env = "0.3.6"
37+
test_util = { version = "10.0.3", path = "test_util" }
2938
time = { version = "0.3.55", features = [
3039
"formatting",
3140
"local-offset",
3241
"parsing",
3342
] }
43+
tracing = { version = "0.1.44", features = [
44+
"max_level_trace",
45+
"release_max_level_trace",
46+
] }
47+
tracing-subscriber = { version = "0.3.23", features = ["fmt"] }
48+
vergen = { version = "10.0.3", path = "vergen", default-features = false }
49+
vergen-gix = { version = "10.0.3", path = "vergen-gix" }
50+
vergen-lib = { version = "10.0.3", path = "vergen-lib" }

test_util/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ repo = ["gix", "rand"]
3030

3131
[dependencies]
3232
anyhow = { workspace = true }
33-
gix = { workspace = true, optional = true}
33+
gix = { workspace = true, optional = true }
3434
rand = { workspace = true, optional = true }
3535
temp-env = { workspace = true }
3636

vergen-git2/Cargo.toml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,10 @@ vcs_info = ["vergen-lib/vcs_info"]
5555
[dependencies]
5656
anyhow = { workspace = true }
5757
bon = { workspace = true }
58-
git2-rs = { version = "0.21.0", package = "git2", default-features = false }
58+
git2-rs = { workspace = true }
5959
time = { workspace = true }
60-
vergen = { version = "10.0.3", path = "../vergen", default-features = false }
61-
vergen-lib = { version = "10.0.3", path = "../vergen-lib", features = [
62-
"git",
63-
] }
60+
vergen = { workspace = true }
61+
vergen-lib = { workspace = true, features = ["git"] }
6462

6563
[build-dependencies]
6664
rustversion = { workspace = true }
@@ -69,7 +67,7 @@ rustversion = { workspace = true }
6967
regex = { workspace = true }
7068
serial_test = { workspace = true }
7169
temp-env = { workspace = true }
72-
test_util = { path = "../test_util", features = ["repo", "unstable"] }
70+
test_util = { workspace = true, features = ["repo", "unstable"] }
7371

7472
[package.metadata.docs.rs]
7573
features = ["build", "cargo", "emit_and_set", "rustc", "si"]

vergen-gitcl/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ vcs_info = ["vergen-lib/vcs_info"]
5454
anyhow = { workspace = true }
5555
bon = { workspace = true }
5656
time = { workspace = true }
57-
vergen = { version = "10.0.3", path = "../vergen", default-features = false }
58-
vergen-lib = { version = "10.0.3", path = "../vergen-lib", features = ["git"] }
57+
vergen = { workspace = true }
58+
vergen-lib = { workspace = true, features = ["git"] }
5959

6060
[build-dependencies]
6161
rustversion = { workspace = true }
@@ -64,7 +64,7 @@ rustversion = { workspace = true }
6464
regex = { workspace = true }
6565
serial_test = { workspace = true }
6666
temp-env = { workspace = true }
67-
test_util = { path = "../test_util", features = ["repo", "unstable"] }
67+
test_util = { workspace = true, features = ["repo", "unstable"] }
6868

6969
[package.metadata.docs.rs]
7070
features = ["build", "cargo", "emit_and_set", "rustc", "si"]

vergen-gix/Cargo.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,15 @@ gix = { workspace = true, features = [
7373
"sha1",
7474
] }
7575
time = { workspace = true }
76-
vergen = { version = "10.0.3", path = "../vergen", default-features = false }
77-
vergen-lib = { version = "10.0.3", path = "../vergen-lib", features = [
78-
"git",
79-
] }
76+
vergen = { workspace = true }
77+
vergen-lib = { workspace = true, features = ["git"] }
8078

8179
[build-dependencies]
8280
rustversion = { workspace = true }
8381

8482
[dev-dependencies]
8583
regex = { workspace = true }
86-
test_util = { path = "../test_util", features = ["repo", "unstable"] }
84+
test_util = { workspace = true, features = ["repo", "unstable"] }
8785
serial_test = { workspace = true }
8886
temp-env = { workspace = true }
8987

vergen-lib/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ rustversion = { workspace = true }
5050
[dev-dependencies]
5151
serial_test = { workspace = true }
5252
temp-env = { workspace = true }
53-
test_util = { path = "../test_util", features = ["unstable"] }
53+
test_util = { workspace = true, features = ["unstable"] }
5454

5555
[package.metadata.docs.rs]
5656
features = ["build", "cargo", "git", "rustc", "si"]

vergen-pretty/Cargo.toml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,17 @@ __vergen_empty_test = ["vergen-gix", "vergen-gix/unstable"]
4545
[dependencies]
4646
anyhow = { workspace = true }
4747
bon = { workspace = true }
48-
console = { version = "0.16.4", optional = true }
49-
convert_case = "0.11.0"
48+
console = { workspace = true, optional = true }
49+
convert_case = { workspace = true }
5050
rand = { workspace = true, optional = true }
51-
serde = { version = "1.0.229", features = ["derive"], optional = true }
52-
rkyv = { version = "0.8.17", features = ["std"], optional = true }
53-
tracing = { version = "0.1.44", features = [
54-
"max_level_trace",
55-
"release_max_level_trace",
56-
], optional = true }
51+
serde = { workspace = true, optional = true }
52+
rkyv = { workspace = true, optional = true }
53+
tracing = { workspace = true, optional = true }
5754

5855
[build-dependencies]
5956
anyhow = { workspace = true }
6057
rustversion = { workspace = true }
61-
vergen-gix = { version = "10.0.3", path = "../vergen-gix", features = [
58+
vergen-gix = { workspace = true, features = [
6259
"build",
6360
"cargo",
6461
"rustc",
@@ -67,8 +64,8 @@ vergen-gix = { version = "10.0.3", path = "../vergen-gix", features = [
6764

6865
[dev-dependencies]
6966
regex = { workspace = true }
70-
serde_json = "1.0.151"
71-
tracing-subscriber = { version = "0.3.23", features = ["fmt"] }
67+
serde_json = { workspace = true }
68+
tracing-subscriber = { workspace = true }
7269

7370
[package.metadata.docs.rs]
7471
features = ["color", "header", "rkyv", "serde", "trace"]

vergen/Cargo.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,19 @@ emit_and_set = ["vergen-lib/emit_and_set"]
3636
[dependencies]
3737
anyhow = { workspace = true }
3838
bon = { workspace = true }
39-
cargo_metadata = { version = "0.23.1", optional = true }
39+
cargo_metadata = { workspace = true, optional = true }
4040
regex = { workspace = true, optional = true }
41-
rustc_version = { version = "0.4.1", optional = true }
42-
sysinfo = { version = "0.39.6", optional = true }
41+
rustc_version = { workspace = true, optional = true }
42+
sysinfo = { workspace = true, optional = true }
4343
time = { workspace = true, optional = true }
44-
vergen-lib = { version = "10.0.3", path = "../vergen-lib" }
44+
vergen-lib = { workspace = true }
4545

4646
[build-dependencies]
4747
rustversion = { workspace = true }
4848

4949
[dev-dependencies]
5050
regex = { workspace = true }
51-
test_util = { path = "../test_util", features = ["unstable"] }
51+
test_util = { workspace = true, features = ["unstable"] }
5252
serial_test = { workspace = true }
5353
temp-env = { workspace = true }
5454

0 commit comments

Comments
 (0)