Skip to content

Repin makepad to main 68d1f4ec - #21

Merged
ymote merged 1 commit into
mainfrom
chore/runtime-makepad-68d1f4ec
Oct 6, 2026
Merged

ymote merged 1 commit into
mainfrom
chore/runtime-makepad-68d1f4ec

Conversation

@ymote

@ymote ymote commented Oct 6, 2026 •

Copy link
Copy Markdown
Collaborator

Moves the runtime lock and the matching Cargo revs from Octoscript-Makepad 2cc5ef37 to aa80f72c (Octoscript-Makepad #78). Its runtime.json pins makepad main 68d1f4ec (makepad #99–#101, the org-wide release) and Octoscript 2e37d9e6. Org rule: every OctoSense-org repository pins the same makepad main.

  • native-runtime.lock.json, catalog/rust/Cargo.toml, probe/rust/Cargo.toml (octoscript-render), and the runtime-lock lines in both READMEs.
  • Octoscript moves to 2e37d9e6 (OctoScript #58, OSM #75). No manifest here depends on Octoscript directly (octoscript-render takes only makepad-script and octoscript-node), so only the READMEs name it.
  • makepad-script (platform/script), the only makepad crate here, has no changed files in c155f61d..68d1f4ec; Octoscript-Makepad changes octoscript-render and octoscript-node by one padright field (#77).
  • Both Cargo.lock files are unchanged (cargo check --locked passes).

Checked locally on macOS at this head with this workflow's steps, against makepad 68d1f4ec, Octoscript-Makepad aa80f72c 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 one warning from its own source, which this PR doesn't touch: an unused constant in the catalog's src/plan.rs and 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

The org-wide makepad release after makepad #99-#101 (Octoscript-Makepad
#78, aa80f72c): Calculator relays its keypad after every apply, Terminal
answers its own agent with read tools only, and makepad-ai-services
gains ui_port. makepad-script, the only makepad crate here, has no
changed files in c155f61d..68d1f4ec. The runtime lock, both manifests'
octoscript-render rev and the READMEs move; the Cargo.lock files don't
change.

Octoscript moves to 2e37d9e6 (OctoScript #58, OSM #75); nothing here
depends on it directly.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@ymote
ymote merged commit 9505da6 into main Oct 6, 2026
2 checks passed
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