[ci_runner] Use merge commit sha from webhook event #6684
Merged
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
maggie-lou
force-pushed
the
merge_commit_sha
branch
6 times, most recently
from
2753f07
to
f08b07f
Compare
maggie-lou
force-pushed
the
merge_commit_sha
branch
from
f08b07f
to
a50cad3
Compare
maggie-lou
changed the title
bduffany
reviewed
Jun 3, 2024
| // the background job has not completed, or if the webhook provider does not | ||
| // provide a generated merge commit. In this case, it should be manually | ||
| // generated by merging the pushed and target branches. | ||
| MergeCommitSHA string |
There was a problem hiding this comment.
any idea how reliable this merge_commit_sha is? if we're unsure, can we put it behind a flag and test in dev for a while?
There was a problem hiding this comment.
err I guess if it's non-empty, then it should exist remotely, otherwise they wouldn't know the SHA?
There was a problem hiding this comment.
If it exists on the webhook data, we should be able to reliably fetch it. I'll merge this now, so we'll have until Thursday to see how this does in dev
bduffany
approved these changes
Jun 3, 2024
| // the background job has not completed, or if the webhook provider does not | ||
| // provide a generated merge commit. In this case, it should be manually | ||
| // generated by merging the pushed and target branches. | ||
| MergeCommitSHA string |
There was a problem hiding this comment.
err I guess if it's non-empty, then it should exist remotely, otherwise they wouldn't know the SHA?
This was referenced Jun 21, 2024
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.
To support merge-with-base behavior on pull requests, we've been fetching the target branch with --depth=0 (to ensure the merge-base is fetched) and manually calling
git mergeon the ci_runner. This can be slow. GitHub automatically generates the mergeCommitSHA on pull requests, so use that from the webhook data instead if it has been setRelated issues: N/A