Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 9 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ members = [
"crates/card-studio",
]

# The app contract (OctoSense ADR 0005): every crate here depends on it by
# version (`octosense-app-contract = "1"`), the way apps and the shell do, so
# a consumer that takes App Hub from git links the crates.io copy and only
# one copy of the contract exists in its build. App Hub itself develops
# against the local crate. A [patch] in this workspace never applies to
# consumers.
[patch.crates-io]
octosense-app-contract = { path = "crates/app-contract" }

# Builds resolve the pinned sources from the prepared sibling checkouts, as
# the OctoSense launcher workspace does.
[patch."https://github.com/OctoSense-org/makepad.git"]
Expand Down
7 changes: 5 additions & 2 deletions crates/app-policy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ description = "Signed app manifests resolved into splash-isolate settings and oc
[dependencies]
# The app contract (ADR 0005): the manifest, the app-facing policy, the
# integrity checks and running a package. This crate re-exports it and adds
# what only App Hub and the shell need.
octosense-app-contract = { path = "../app-contract", version = "1" }
# what only App Hub and the shell need. By version only, never a path: a
# consumer that takes this crate from git (the OctoSense shell) must link the
# same crates.io copy as every app (Rinx), or Cargo builds two contracts. The
# workspace's [patch.crates-io] points it at crates/app-contract here.
octosense-app-contract = "1"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
# Only for the splash adapter: the policy core never touches makepad, so the
Expand Down