Fix compile-tests workflow#121
Merged
loganek merged 1 commit intoWebAssembly:mainfrom Aug 27, 2025
Merged
Conversation
Collaborator
Author
|
Hmm, need to --no-commit the merge I think... apologies for the noise :/ |
Moving source files out of the built dir effectively removed the built dir, causing merge conflicts in the workflow that rebuilt the wasm tests which were supposed to be in that dir. Fix by doing a `--strategy ours` merge, then forcibly resetting the tree state to the main branch, then checking out the built files. This ensures that the tree contains precisely the upstream source code, plus our built files, while keeping the parent tree.
loganek
approved these changes
Aug 27, 2025
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
2 participants
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.
Moving source files out of the built dir effectively removed the built dir, causing merge conflicts in the workflow that rebuilt the wasm tests which were supposed to be in that dir.
Fix by doing a
--strategy oursmerge, then forcibly resetting the tree state to the main branch, then checking out the built files. This ensures that the tree contains precisely the upstream source code, plus our built files, while keeping the parent tree.