Skip to content

Pin makepad 32d6415f / OSM 33dea2f1 (13th sweep) - #22

Merged
ymote merged 1 commit into
mainfrom
chore/runtime-makepad-32d6415f
Oct 8, 2026
Merged

ymote merged 1 commit into
mainfrom
chore/runtime-makepad-32d6415f

Conversation

@ymote

@ymote ymote commented Oct 8, 2026

Copy link
Copy Markdown
Collaborator

Moves the runtime lock and the matching Cargo revs from Octoscript-Makepad aa80f72c to 33dea2f1 (Octoscript-Makepad #80). Its runtime.json pins makepad main 32d6415f and Octoscript 2e37d9e6 (unchanged). Org rule: every OctoSense-org repository pins the same makepad main.

The new makepad brings the vendored makepad-script-compute kernel JIT and its vm feature (makepad#107/#108) and script fixes: the EOF last-token fix, ScriptErrorRecord, and colour channels.

  • native-runtime.lock.json, catalog/rust/Cargo.toml, probe/rust/Cargo.toml (octoscript-render), and the runtime-lock lines in both READMEs.
  • Octoscript stays at 2e37d9e6 (no manifest here depends on it directly; only the READMEs name it).
  • makepad-script (platform/script), the only makepad crate here, picks up the script fixes above in 68d1f4ec..32d6415f; the vendored compute crate is a sibling it does not depend on, so the dependency graph is unchanged. Octoscript-Makepad aa80f72c..33dea2f1 changes only octoscript-makepad (bundled card fonts, #79) and its own pins (#80); octoscript-render and octoscript-node are untouched.
  • Both Cargo.lock files are unchanged (cargo check --locked passes).

Checked locally on macOS at this head with this workflow's steps, against makepad 32d6415f, Octoscript-Makepad 33dea2f1 and Octoscript 2e37d9e6 as siblings:

  • tools/setup-native.py (prepare, including the consumer check of both manifests): pass.
  • cargo check --locked of catalog/rust/Cargo.toml and probe/rust/Cargo.toml: pass. Each prints the same single pre-existing warning as before, from this repo's own source (an unused constant in the catalog's src/plan.rs, an unneeded mut in the probe's src/lib.rs).
  • setup-native.py --check --cargo-manifest of both: pass (makepad-script and makepad-live-id resolve to the one makepad checkout).

🤖 Generated with Claude Code

Move the runtime lock and the matching Cargo revs from Octoscript-Makepad
aa80f72c to 33dea2f1 (OSM #80), whose runtime.json pins makepad main
32d6415f (compute kernel JIT + script fixes) and Octoscript 2e37d9e6
(unchanged): native-runtime.lock.json, octoscript-render in
catalog/rust/Cargo.toml and probe/rust/Cargo.toml, and the runtime-lock
lines in both READMEs. Both Cargo.lock files are unchanged.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@ymote
ymote merged commit 77887a4 into main Oct 8, 2026
2 checks passed
@ymote
ymote deleted the chore/runtime-makepad-32d6415f branch October 8, 2026 00:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant