tools: keep multi-commit PRs in the commit queue - #65386
Closed
anonrig wants to merge 1 commit into
Closed
Conversation
Ready pull requests with more than one commit and no commit-queue-squash or commit-queue-rebase label were landed with --oneCommitMax. git node land then refused to finish and the queue replaced commit-queue with commit-queue-failed. Skip those pull requests in the metadata filter and landing script, leave a one-time comment asking for a policy label, and keep them in the queue. Signed-off-by: Yagiz Nizipli <yagiz@nizipli.com>
Collaborator
|
Review requested:
|
nodejs-github-bot
added
meta
Contributor
|
What's the upside? That seems like adding complexity for no benefits |
Member
|
What's the point? I'm looking at #65324 and find nothing out of the ordinary in how CQ was processed. CQ wasn't broken, it was waiting for 48 hours as the minimum without fast-track and then failed because of missing policy squash/rebase instruction. Leaving it in the queue would eat up rate limits on every subsequent run. The failure comment could be improved - yes. |
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.
Ready pull requests with more than one commit and neither
commit-queue-squashnorcommit-queue-rebasewere landed with--oneCommitMax.git node landapplied the patches, then refused to finish and asked for one of those labels. The queue treated that as a hard failure and replacedcommit-queuewithcommit-queue-failed.That is what just happened to #65324, which was otherwise ready (approvals, GitHub CI, Jenkins CI).
This change:
commit-queue-squashorcommit-queue-rebasecommit-queuelabel so a later run can land the PR after a label is addedgit node landrefusal as a skip if it still happensThe commit queue itself is running. Recent successes include #64532. PRs younger than the 48-hour multi-approval wait, or with only one approval (7-day wait), are still skipped on wait time as before.
Refs: #65324