Repository navigation
Repin the shared runtime to Octoscript-Makepad main 297ff0bb - #7
Merged
Merged
Conversation
The lock and both octoscript-render git revs selected b1596d9c, the pre-history-rewrite hash of Octoscript-Makepad f4acc6c. Its content is on main (the only differences are scrubbed home-directory paths), so nothing is lost. Main 297ff0bb pins makepad cd812acd and Octoscript 68f6a9df. Host cargo check of catalog and probe, setup-native --check on both manifests and the host route probe (42 routes, 0 suspicious) pass; the README's known-gap note now records the fix. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
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
1 participant
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.
Fixes #4.
native-runtime.lock.jsonand theoctoscript-rendergit revs selected Octoscript-Makepadb1596d9c, which is not on itsmain. It is the pre-history-rewrite hash of main'sf4acc6c("Include the current Android Home and build-tool support in the shared release"):git diff b1596d9c f4acc6cshows only scrubbed home-directory paths in docs and kit JSON. Nothing the renderer uses is missing from main, so no runtime port was needed.Changes:
catalog/rust+probe/rustoctoscript-renderrevs → Octoscript-Makepad main297ff0bb(makepadcd812acd, Octoscript68f6a9df;463e3da8plus two docs-only merges).Verified on a macOS host in a fresh workspace that holds this repo and Octoscript-OH on the same runtime:
cargo check --lockedforcatalog/rustandprobe/rust→ ok (lock files unchanged)python3 tools/setup-native.py --check --cargo-manifestfor both manifests → okcd catalog/rust && cargo run --release --example probe→42 routes, 0 suspiciouscargo check --target aarch64-linux-androidforprobe/rust→ okNot verified: the catalog's Android-target build (
ringneeds the NDK, which this host lacks), the Gradle APK and a device run.🤖 Generated with Claude Code