tools: avoid crashing CQ when git push fails#36861
Closed
aduh95 wants to merge 2 commits intonodejs:masterfrom
Closed
tools: avoid crashing CQ when git push fails#36861aduh95 wants to merge 2 commits intonodejs:masterfrom
aduh95 wants to merge 2 commits intonodejs:masterfrom
Conversation
Contributor
Author
|
Ping @mmarchini |
mmarchini
approved these changes
Jun 10, 2021
Contributor
mmarchini
left a comment
mmarchini
left a comment
There was a problem hiding this comment.
LGTM. I assume this was not tested, correct? If that's the case I'd suggest whoever lands this to keep an eye on the CQ right after landing to ensure it doesn't break anything, and if it does be ready to open a revert and fast-track it.
bl-ue
approved these changes
Jun 10, 2021
| commit_queue_failed "$pr" | ||
| # If `git node land --abort` fails, we're in unknown state. Better to stop | ||
| # the script here, current PR was removed from the queue so it shouldn't | ||
| # interfer again in the future |
Contributor
There was a problem hiding this comment.
Suggested change
| # interfer again in the future | |
| # interfere again in the future |
Contributor
Author
There was a problem hiding this comment.
This can be fixed in another PR, this PR may need an immediate revert if it breaks the CQ.
| } | ||
|
|
||
| # TODO(mmarchini): should this be set with whoever added the label for each PR? | ||
| git config --local user.email "github-bot@iojs.org" |
Contributor
There was a problem hiding this comment.
Out of curiosity, why? Just haven't gotten around to changing it?
Contributor
There was a problem hiding this comment.
Probably. I don't have context on it tbh.
aduh95
added
the
author ready
aduh95
added
the
commit-queue
github-actions
bot
removed
the
commit-queue
Contributor
|
Landed in 864195b...240c8bc |
nodejs-github-bot
pushed a commit
that referenced
this pull request
Jun 11, 2021
PR-URL: #36861 Reviewed-By: Mary Marchini <oss@mmarchini.me>
Contributor
Author
|
CQ just landed #38870 (comment), seems like everything is working as expected 🚀 |
danielleadams
pushed a commit
that referenced
this pull request
Jun 13, 2021
PR-URL: #36861 Reviewed-By: Mary Marchini <oss@mmarchini.me>
Merged
danielleadams
pushed a commit
that referenced
this pull request
Jun 17, 2021
PR-URL: #36861 Reviewed-By: Mary Marchini <oss@mmarchini.me>
richardlau
pushed a commit
that referenced
this pull request
Jul 19, 2021
PR-URL: #36861 Reviewed-By: Mary Marchini <oss@mmarchini.me>
richardlau
pushed a commit
that referenced
this pull request
Jul 20, 2021
PR-URL: #36861 Reviewed-By: Mary Marchini <oss@mmarchini.me>
Merged
foxxyz
pushed a commit
to foxxyz/node
that referenced
this pull request
Oct 18, 2021
PR-URL: nodejs#36861 Reviewed-By: Mary Marchini <oss@mmarchini.me>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This is useful in case someone pushed to the master branch while the CQ was trying to land a PR, or if the CQ bot doesn't have the correct credentials. Currently it silently crashes, without adding a
commit-queue-failedlabel on the PRs; with this PR, it should always add a label and comment on the PR./cc @mmarchini