Skip to content

tools: abort CQ session when landing several commits - #40577

Merged
aduh95 merged 3 commits into
nodejs:masterfrom
aduh95:more-control-on-commit-queue
Nov 1, 2021
Merged

tools: abort CQ session when landing several commits#40577
aduh95 merged 3 commits into
nodejs:masterfrom
aduh95:more-control-on-commit-queue

Conversation

@aduh95

@aduh95aduh95 commented Oct 23, 2021

Copy link
Copy Markdown
Contributor

Most PRs are meant to be squashed in one commit when landing. If the
collaborator hasn't been using fixup! commits, the CQ will land the PR
as several commits. This change makes the CQ abort by default
when attempting to land several commits, unless there's another
label added to the PR to force squashing or landing as several commits.

Fixes: #40436
Blocked on nodejs/node-core-utils#572

Most PRs are meant to be squashed in one commit when landing. If the
collaborator hasn't been using `fixup!` commits, the CQ lands the PR
as several commits. This change makes the CQ abort by default
when attempting to land several commits, unless there's another
label added to the PR to force squashing or landing as several commits.
Fixes: nodejs#40436
Refs: nodejs/node-core-utils#572
@aduh95aduh95 added the blocked PRs that are blocked by other issues or PRs. label Oct 23, 2021
@nodejs-github-botnodejs-github-bot added the tools Issues and PRs related to the tools directory. label Oct 23, 2021
Comment threaddoc/guides/commit-queue.md Outdated
Comment threadtools/actions/commit-queue.sh
@aduh95aduh95 removed the blocked PRs that are blocked by other issues or PRs. label Oct 29, 2021
aduh95 added a commit to nodejs/node-auto-test that referenced this pull request Oct 30, 2021
Most PRs are meant to be squashed in one commit when landing. If the
collaborator hasn't been using `fixup!` commits, the CQ lands the PR
as several commits. This change makes the CQ abort by default
when attempting to land several commits, unless there's another
label added to the PR to force squashing or landing as several commits.
Fixes: nodejs/node#40436
Refs: nodejs/node-core-utils#572
PR-URL: nodejs/node#40577
aduh95 added a commit to nodejs/node-auto-test that referenced this pull request Oct 30, 2021
Most PRs are meant to be squashed in one commit when landing. If the
collaborator hasn't been using `fixup!` commits, the CQ lands the PR
as several commits. This change makes the CQ abort by default
when attempting to land several commits, unless there's another
label added to the PR to force squashing or landing as several commits.
Fixes: nodejs/node#40436
Refs: nodejs/node-core-utils#572
PR-URL: nodejs/node#40577
Comment threaddoc/guides/commit-queue.md Outdated
@aduh95aduh95 added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Oct 31, 2021
@aduh95
aduh95 merged commit 9bd6d52 into nodejs:masterNov 1, 2021
@aduh95

Copy link
Copy Markdown
ContributorAuthor

Landed in 9bd6d52

@aduh95
aduh95 deleted the more-control-on-commit-queue branch November 1, 2021 20:03
targos pushed a commit that referenced this pull request Nov 6, 2021
Most PRs are meant to be squashed in one commit when landing. If the
collaborator hasn't been using `fixup!` commits, the CQ lands the PR
as several commits. This change makes the CQ abort by default
when attempting to land several commits, unless there's another
label added to the PR to force squashing or landing as several commits.
Fixes: #40436
Refs: nodejs/node-core-utils#572
PR-URL: #40577
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
@targostargos mentioned this pull request Nov 8, 2021
BethGriggs pushed a commit that referenced this pull request Nov 25, 2021
Most PRs are meant to be squashed in one commit when landing. If the
collaborator hasn't been using `fixup!` commits, the CQ lands the PR
as several commits. This change makes the CQ abort by default
when attempting to land several commits, unless there's another
label added to the PR to force squashing or landing as several commits.
Fixes: #40436
Refs: nodejs/node-core-utils#572
PR-URL: #40577
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
@BethGriggsBethGriggs mentioned this pull request Nov 26, 2021
1 task
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

author readyPRs that have at least one approval, no pending requests for changes, and a CI started.toolsIssues and PRs related to the tools directory.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Commit queue and unsquashed commits

5 participants

@aduh95@Trott@targos@Mesteery@nodejs-github-bot