Merge latest upstream and preserve fork hardening#2
Merged
Conversation
…er-click debugging
…via the script editor, with its openable extensions as a Unterm preference
This was referenced Jul 13, 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.
What changed
tnayuki/Unity-Unterm:maininto the hardened Rank Up Games fork without discarding the fork's existing commits..exelookup.macos-15to remove the reported build annotations.Why
The fork was four commits behind upstream and GitHub could not synchronize it automatically because both sides changed the external-editor and settings integration. A direct upstream merge also exposed two fork-CI lint failures, stale legal notices, and a packaging gap where the new debugger executable was never shipped to Unity consumers.
Validation
cargo test -p unterm --lib --locked— 55 passed, 1 ignored--binson Rust 1.94.1 — passedcargo audit --file native/Cargo.lock— passed (four existing policy-allowed unmaintained warnings)cargo deny --manifest-path native/Cargo.toml --config native/deny.toml check advisories bans licenses sources— passednpx --no-install github-actionlint .github/workflows/split-upm.yml— passedbash -n native/build-macos.sh— passedgit diff --cached --check— passed before commitGitHub Actions remains the authoritative cross-platform build proof for the universal macOS executable and Windows executable.