Base versioned commit on the tip of the PR head branch #1052
Conversation
This file contains 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
klutchell
force-pushed
the
kyle/test-on-head
branch
from
0bab059
to
9b1c14a
Compare
Historically we have used the PR merge commit, which is the GitHub default, to ensure that we are testing the same merges that will be committed to the target branch. However, we already require that branches be rebased on the target before merging via branch protections so there is no benefit gained from using the merge commit. We also would like to enable use cases where we are testing against old versions of the target branch and not include changes from the tip of the target. Change-type: major Signed-off-by: Kyle Harding <[email protected]>
klutchell
force-pushed
the
kyle/test-on-head
branch
from
9b1c14a
to
2d9d2a3
Compare
|
Test with a fork of a fork here: balena-io-experimental#8 |
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.
Historically we have used the PR merge commit, which is the GitHub default, to ensure that we are testing the same merges that will be committed to the target branch.
However, we already require that branches be rebased on the target before merging via branch protections so there is no benefit gained from using the merge commit.
We also would like to enable use cases where we are testing against old versions of the target branch and not include changes from the tip of the target.
Change-type: major
See: https://balena.zulipchat.com/#narrow/stream/348930-balena-io.2Fflowzone/topic/Flowzone.20runs.20tests.20w.2F.20merge.20w.2F.20master/near/438995412
See: https://balena.fibery.io/Work/Project/Base-Flowzone-versioned-commit-on-the-tip-of-the-PR-head-537