fix(scripts/diff-flat): fetch pull/*/merge, not pull/*/head
#27580
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
Otherwise the merge base may not be available.
github-actions
bot
added
infra
caugner
changed the title
pull/*/merge, not pull/*/head
github-actions
bot
added
size:s
|
Once merged, let's re-enable the workflow. |
queengooborg
approved these changes
Aug 13, 2025
|
Workflow has been re-enabled! |
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.
Summary
Changes the
diff:flatscript to fetch the/mergetip of the PR, rather than the/headtip.Test results and supporting details
Background
After merging #25352, the PR Review Companion started failing most of the time.
Problem
The workflow uses
diff:flatto compare the PR tip with themainbranch. For this, it needs the merge base, but the checkout by default doesn't fetch any history, so the merge base was likely not fetched unless the PR was based on the latestmaincommit.Solution
Compare the result of merging the PR into the
mainbranch, with themainbranch.Note: Tested this with a local shallow clone of BCD.
Related issues