Merged
Conversation
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
Replace
crates/surge-core/vendorwith real vendored C sources instead of a symlink to../../vendor/bsdiff.This fixes clean-clone and release packaging cases where the symlink is not preserved, which was breaking Windows builds of
surge-coreand the Horizon Windows smoke.Behavior impact
Clean Surge checkouts now contain the
surge-corebsdiff, bzip2, and libdivsufsort sources directly under the crate, so:cargo package -p surge-coreincludes the required C sourcesvendor/3rdparty/bzip2/*.cis missingTest evidence
cargo package -p surge-core --allow-dirty./scripts/check-version-sync.shcargo fmt --all -- --checkRUSTFLAGS='-D warnings' cargo test --workspacecargo clippy --all-targets --all-features -- -D warningscargo clippy --workspace --lib --bins --examples -- -D warnings -D clippy::unwrap_used -D clippy::expect_usedcargo clippy --workspace --all-targets --all-features -- -D warnings -W clippy::pedanticdotnet format dotnet/Surge.slnx --verify-no-changesdotnet test dotnet/Surge.slnx --configuration ReleaseMotivation
The Horizon Windows Azure smoke reached the real installer/update path and then failed while compiling
surge-corefrom the tagged Surge source because the clean checkout did not have the vendored C sources thatbuild.rsexpects. This PR fixes that upstream issue directly.