Skip to content

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

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

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

Conversation

@ymote

@ymote ymote commented Oct 8, 2026

Copy link
Copy Markdown
Collaborator

Moves the runtime lock 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 and the runtime-lock lines in both READMEs.
  • octoscript-core in crates/octoscript-oh-arkui and crates/octoscript-oh-webview stays at Octoscript 2e37d9e6: the runtime's runtime.json still pins that revision, so the consumer check (tools/setup-native.py → runtime.py --consumer) accepts it unchanged.
  • Cargo.lock is unchanged. makepad-script (platform/script), the only makepad crate here (via this workspace's [patch]), 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.

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 and the consumer check of all workspace manifests), cargo check --locked --manifest-path Cargo.toml, and setup-native.py --check --cargo-manifest Cargo.toml. All pass. The build's warnings are the same pre-existing ones in this repo's webview and example crates, which this PR does not touch.

🤖 Generated with Claude Code

Move the runtime lock 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 and the runtime-lock lines in both READMEs.
The octoscript-core revs stay at 2e37d9e6 and Cargo.lock is unchanged.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@ymote
ymote merged commit 33f6984 into master 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