Increase number of commits checked for squash merge #866
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
tevanoff
force-pushed
the
tom/ap-3123-squashrebase-merge-detection-can-fail-if-build-hasnt-run-for
branch
2 times, most recently
from
590191d
to
c3c253b
Compare
tevanoff
commented
Dec 2, 2023
tmeasday
requested changes
Dec 4, 2023
|
@tevanoff I tested out the canary and it worked well. In fact better than I expected: This PR's squash merge (no build, this commit) was detected on a build for a later commit on the base branch But even better, it didn't use a build on the head branch I created after the merge. I guess |
tevanoff
force-pushed
the
tom/ap-3123-squashrebase-merge-detection-can-fail-if-build-hasnt-run-for
branch
from
a7e171c
to
847d236
Compare
Instead of first checking if the current commit is a PR merge commit, instead, calculate all possible ancestor commits, THEN append the PR head to that list if relevant. This is a first step towards checking more than one commit being a PR merge commit
tevanoff
force-pushed
the
tom/ap-3123-squashrebase-merge-detection-can-fail-if-build-hasnt-run-for
branch
from
847d236
to
b9cf522
Compare
tevanoff
added
minor
tevanoff
deleted the
tom/ap-3123-squashrebase-merge-detection-can-fail-if-build-hasnt-run-for
branch
|
🚀 PR was released in |
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.
When a Chromatic build is run on a squashed merge commit, there's no way to determine the source branch to look for ancestor builds since the git history is lost during the squash. To get around this, we try to query the git provider for a PR that resulted in the squashed commit, which will give us the information we need.
We're currently only doing this lookup on the commit that a build is running on. This change increases the number of parent commits that we try to do the lookup on.
📦 Published PR as canary version:
10.0.1--canary.866.7107771516.0✨ Test out this PR locally via: