Skip to content

lance-graph-ogar: revert OGAR pin to branch=main — one golden-image source (#648 P2) #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AdaWorldAPI merged 1 commit into from
Jul 5, 2026
+17 −17
Merged

lance-graph-ogar: revert OGAR pin to branch=main — one golden-image source (#648 P2) #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions crates/lance-graph-ogar/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,21 +78,21 @@ lance-graph-contract = { path = "../lance-graph-contract" }
# against live in lance-graph-ontology (OGIT). OGIT does NOT depend on OGAR.
lance-graph-ontology = { path = "../lance-graph-ontology" }

# ── OGAR Active-Record forks: git deps (the canonical superset; matches
# symbiont's pins so they resolve to ONE source in the golden image) ──
# ── OGAR Active-Record forks: git deps @ main (the canonical superset; matches
# symbiont's + cognitive-stack's pins so ALL golden-image roots resolve to
# ONE OGAR source) ──
#
# TEMP-PIN to OGAR #152 rev (Geo/OSM + network_layer codebook mint:
# class_ids::ALL 68→79). The mirror in lance-graph-contract carries the same
# concepts, so COUNT_FUSE (mirror::CODEBOOK.len() == ogar_vocab::class_ids::ALL
# .len()) requires BOTH sides at 79. OGAR main is still 68 until #152 merges —
# pinning to the pushed rev keeps the lockstep green now. REVERT the four deps
# to branch = "main" once OGAR #152 lands on main (one source in the golden image).
ogar-vocab = { git = "https://github.com/AdaWorldAPI/OGAR", rev = "58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d" }
ogar-class-view = { git = "https://github.com/AdaWorldAPI/OGAR", rev = "58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d" }
ogar-ontology = { git = "https://github.com/AdaWorldAPI/OGAR", rev = "58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d" }
# Back to branch = "main" now that OGAR #152 (Geo/OSM + network_layer, ALL=79)
# has merged: main == the temp-pinned rev, so the contract mirror (79) and
# ogar_vocab::class_ids::ALL (79) agree via COUNT_FUSE, and symbiont /
# cognitive-stack (which also `branch = "main"` these crates) resolve the SAME
# single OGAR copy instead of a second one at a rev (codex P2 on #648).
ogar-vocab = { git = "https://github.com/AdaWorldAPI/OGAR", branch = "main" }

@chatgpt-codex-connector chatgpt-codex-connector Bot Jul 5, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Update the cognitive-stack lock to the new OGAR main

Changing these deps back to the git+...OGAR?branch=main source makes crates/cognitive-stack resolve lance-graph-ogar against its own checked-in Cargo.lock, but that lock was not updated and still pins the same branch source to #f4323c094c4535b6127b0da89440974749df585e (crates/cognitive-stack/Cargo.lock lines 5986–6010), not the root lock's #76dcb27. Because cognitive-stack is its own workspace and its documented cargo build --manifest-path crates/cognitive-stack/Cargo.toml uses that local lockfile, the activation crate now collapses onto the stale OGAR revision, whose codebook predates the 79-entry contract mirror, so parity::COUNT_FUSE fails before the golden-image binary can build; please regenerate/update that lock together with this manifest change.

Useful? React with 👍 / 👎.

ogar-class-view = { git = "https://github.com/AdaWorldAPI/OGAR", branch = "main" }
ogar-ontology = { git = "https://github.com/AdaWorldAPI/OGAR", branch = "main" }
# default features only = the light emit() DDL formatter (no surrealdb tree);
# the parser half is opt-in via this crate's `surrealql-parser` feature.
ogar-adapter-surrealql = { git = "https://github.com/AdaWorldAPI/OGAR", rev = "58a64d4701eaf70ff67fe53a5e2087d5d0c48c0d" }
ogar-adapter-surrealql = { git = "https://github.com/AdaWorldAPI/OGAR", branch = "main" }

# Fold ogar-class-view's transitive `lance-graph-contract` (git
# AdaWorldAPI/lance-graph#main) onto the SAME path copy this crate uses, so there
Expand Down
Loading