Repository navigation
deps: pin makepad-script to octoscript 9069cfa (synced with upstream work d476e52) - #24
Merged
Merged
Conversation
…work d476e52) Move the makepad-script git pin in crates/octoscript-core and crates/octoscript-capabilities (and the copy quoted in UPSTREAM.md) from 1fdce273bf888239079754a1834734635eaed34f to 9069cfaf87960f535f2440d736d223238b88c5b1, the merge of fork PR #2 that syncs the octoscript branch with upstream makepad `work` d476e5245 (25 upstream commits). Cargo.lock and fuzz/Cargo.lock follow via `cargo update -p makepad-script`; the 13 packages from that git source move together, nothing else in either lockfile changes. Verification: cargo check --workspace --all-targets: clean cargo test --workspace --no-fail-fast: 988 passed, 2 failed (the_field_vocabularies_match_the_toml_spec, the_source_catalog_matches_the_toml_spec: pre-existing catalog drift, identical to the baseline on main) Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01JgSir4cQyaakzPju4h6smw
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
Moves the
makepad-scriptgit pin from1fdce273bf888239079754a1834734635eaed34fto9069cfaf87960f535f2440d736d223238b88c5b1— the merge of fork PR #2, which syncs theoctoscriptbranch of OctoSense-org/makepad with upstream makepadworkd476e5245(25 upstream commits; the makepad-script suites were verified green on the fork side).Touched:
crates/octoscript-core/Cargo.toml,crates/octoscript-capabilities/Cargo.toml— the two pinned manifests, same rev in both per UPSTREAM.mdUPSTREAM.md— the quoted pin lineCargo.lock,fuzz/Cargo.lock—cargo update -p makepad-script; the 13 packages from that git source (makepad-script, makepad-script-derive, makepad-live-id, makepad-live-id-macros, makepad-math, makepad-micro-proc-macro, makepad-micro-serde, makepad-micro-serde-derive, makepad-regex, makepad-stitch, smallvec, ...) move together; no package added or removed, no other dependency changedVerification
The 2 failures are
the_field_vocabularies_match_the_toml_specandthe_source_catalog_matches_the_toml_spec— the pre-existing catalog drift, identical to the baseline onmain(988 passed / 2 failed). No regression from the 25 upstream commits.Follow-up
Octoscript-OH consumes
octoscript-corebybranch = "main", so after this merges OH needs acargo update -p octoscript-coreto pick up the new makepad rev (a PR for the vendor-removal re-pin is being opened separately and notes this).🤖 Generated with Claude Code
https://claude.ai/code/session_01JgSir4cQyaakzPju4h6smw