Merge PR to target branch before building #11
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
TheLortex
changed the title
Author
|
Rebased on top of |
Contributor
|
more than 1.5 years later, and me not understanding much of this code, I wonder what the status of this PR is? from the title it sounds like that's the right way to go forward :) |
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.
This PR adds a new piece of ocurrent incantations to merge PR to their target branch before testing.
A new
Merge_commitmodule is added to take care of that logic. AMerge_commit.tcan be transformed into a child build (Obuilder_spec.t) that exports the merged repository state in a/mergedfolder. It can then be copied into the main build.