Repository navigation
Conversation
`cargo update -p octoscript-core`: Octoscript main c0ec7fd -> 5379eed (merge of Octoscript PR #23, which removes vendor/ and consumes the VM solely as the makepad-script git pin). octoscript-ui-l0 moves with it, same source. makepad-script stays at 1fdce273 because that is what Octoscript main pins today. A second `cargo update -p octoscript-core` will be needed once Octoscript PR #24 (makepad-script pin -> 9069cfa, synced with upstream work d476e52) merges to main. Verification: cargo metadata --locked: ok cargo check -p octoscript-oh-core: clean Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JgSir4cQyaakzPju4h6smw
Collaborator
Author
|
Superseded: Octoscript #24 merged, so the re-pin is redone together with the arkui ScriptVm fix in one PR. |
This was referenced Sep 29, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
cargo update -p octoscript-coreagainst current Octoscriptmain:octoscript-core(andoctoscript-ui-l0, same git source):c0ec7fd->5379eed— the merge of Octoscript PR #23, which removesvendor/and consumes the Makepad VM solely through themakepad-scriptgit pin.makepad-scriptand the other 12 packages from OctoSense-org/makepad stay at1fdce273, because that is what Octoscriptmainpins today.Only
Cargo.lockchanges (2 source lines); no package added or removed.Verification
Note:
octoscript-oh-coredoes not depend onoctoscript-core(onlyoctoscript-oh-arkuiandoctoscript-oh-webviewdo), so that check does not exercise the re-pin.Pre-existing breakage on master (not introduced here)
cargo check -p octoscript-oh-arkui(and therefore-p octoscript-oh-webview, which depends on arkui) fails with the same two errors on master's lockfile (octoscript-corec0ec7fd, makepad1fdce27) as on this branch:dsl.rs:228-229still constructsScriptVmwith the old (vendored-VM) field layout; it needs updating to the fork VM'sScriptVmconstructor. That is a code fix for a separate PR, not something a lock re-pin can address.Second re-pin needed after Octoscript #24
OH consumes
octoscript-corebybranch = "main", so it can only follow what Octoscriptmainhas merged. Octoscript PR #24 moves themakepad-scriptpin to9069cfaf(octoscript branch synced with upstream makepadworkd476e52, 25 upstream commits; Octoscript verified at 988 passed / 2 pre-existing catalog-drift failures, no regression). Once that merges, a secondcargo update -p octoscript-coreis required here to pull the new makepad rev into this lockfile — this PR does not (and cannot yet) include it.🤖 Generated with Claude Code
https://claude.ai/code/session_01JgSir4cQyaakzPju4h6smw