Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Base versioned commit on the tip of the PR head branch #7

Merged
merged 2 commits into from
May 16, 2024

Conversation

klutchell
Copy link
Collaborator

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

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 <kyle@balena.io>
Signed-off-by: Kyle Harding <kyle@balena.io>
@flowzone-app flowzone-app bot merged commit 886a45b into master May 16, 2024
52 of 53 checks passed
@flowzone-app flowzone-app bot deleted the kyle/test-on-head branch May 16, 2024 15:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant