Skip to content

Commit 8d02fd4

Browse files
committed
ogar-from-{ruff,rails}: rev-pin ruff to 61ce2b49 (codex P1 on #149)
ogar-from-ruff reads ruff_spo_triplet::Model::inherits (added in ruff #40). With no committed Cargo.lock, the floating `branch = "main"` pin could resolve to a ruff rev WITHOUT that field on a clean build and fail to compile — and the prior commit's '61ce2b49' claim didn't travel. Pin all three ruff refs (ruff_spo_triplet + ruff_spo_address in ogar-from-ruff, ruff_ruby_spo in ogar-from-rails) to the exact rev 61ce2b49 (ruff main at the #40 merge). Same rev across both crates: they share ruff_spo_triplet internally, so a mismatch would double-check-out ruff. Verified: ruff re-locks to 61ce2b49; ogar-from-ruff 48 tests + ogar-from-rails green; workspace check + clippy -D warnings clean.
1 parent 1db31bc commit 8d02fd4

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

crates/ogar-from-rails/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,7 @@ serde = [
1919
[dependencies]
2020
ogar-vocab = { path = "../ogar-vocab" }
2121
ogar-from-ruff = { path = "../ogar-from-ruff" }
22-
ruff_ruby_spo = { git = "https://github.com/AdaWorldAPI/ruff", branch = "main" }
22+
# Same exact ruff rev as ogar-from-ruff (they share ruff_spo_triplet
23+
# internally; a rev mismatch double-checks-out ruff). Bump in lockstep.
24+
ruff_ruby_spo = { git = "https://github.com/AdaWorldAPI/ruff", rev = "61ce2b490fc3c432d36c44eceed08125f838b405" }
2325
serde = { workspace = true, optional = true }

crates/ogar-from-ruff/Cargo.toml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,13 @@ serde = ["dep:serde", "ogar-vocab/serde"]
1414

1515
[dependencies]
1616
ogar-vocab = { path = "../ogar-vocab" }
17-
ruff_spo_triplet = { git = "https://github.com/AdaWorldAPI/ruff", branch = "main" }
18-
ruff_spo_address = { git = "https://github.com/AdaWorldAPI/ruff", branch = "main" }
17+
# ruff pinned to an exact rev (not floating `branch = "main"`): this crate
18+
# reads `ruff_spo_triplet::Model::inherits`, added in ruff PR #40. With no
19+
# committed Cargo.lock, a floating branch could resolve `main` to a rev
20+
# WITHOUT that field and fail to compile. `61ce2b49` is ruff main at the #40
21+
# merge. Both ruff crates MUST share one rev (they depend on ruff_spo_triplet
22+
# internally; a mismatch double-checks-out ruff). Bump in lockstep with
23+
# ogar-from-rails.
24+
ruff_spo_triplet = { git = "https://github.com/AdaWorldAPI/ruff", rev = "61ce2b490fc3c432d36c44eceed08125f838b405" }
25+
ruff_spo_address = { git = "https://github.com/AdaWorldAPI/ruff", rev = "61ce2b490fc3c432d36c44eceed08125f838b405" }
1926
serde = { workspace = true, optional = true }

0 commit comments

Comments
 (0)