Keep the additive resolver reachable after the upstream checkout - #72
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.
The fallback added in #71 never ran. The first real release attempt hit the three expected add/add conflicts and refused anyway:
Resolve checks the upstream base tag out into this repo's own working tree, so by the time the merge runs, the tree is upstream's and
scripts/unsloth/additive_merge.pyis not in it.python3 scripts/unsloth/additive_merge.pyfailed on a missing file, and theiftreated that as "could not resolve".The preflight was unaffected, and that is why it passed: it clones upstream into a subdirectory and calls the script from the parent checkout, which stays intact.
Copy the resolver to
$RUNNER_TEMPbefore the checkout and call it there.