delta/node-new.git/tools/actions/commit-queue.sh, branch main

tools: update main branch name

2022-06-17T07:48:18+00:00

PR-URL: https://github.com/nodejs/node/pull/43440
Refs: https://github.com/nodejs/node/issues/33864
Reviewed-By: Luigi Pinca 
Reviewed-By: LiviaMedeiros 
Reviewed-By: Beth Griggs 
Reviewed-By: Mohammed Keyvanzadeh 
Reviewed-By: Richard Lau 
Reviewed-By: Darshan Sen 
Reviewed-By: Antoine du Hamel

tools: fix skip PR if CI is still running

2022-03-21T04:33:11+00:00

resolve: https://github.com/nodejs/node/issues/40330

PR-URL: https://github.com/nodejs/node/pull/42377
Fixes: https://github.com/nodejs/node/issues/40330
Reviewed-By: Antoine du Hamel 
Reviewed-By: Michael Dawson 
Reviewed-By: Mestery

tools: remove last of error-masking in commit-queue.sh

2022-01-01T17:25:36+00:00

Remove the lats of the unintentional error-masking in commit-queue.sh.

With this change, `tools/lint-sh.js . --from-npx` at last passes.

PR-URL: https://github.com/nodejs/node/pull/41356
Reviewed-By: Luigi Pinca 
Reviewed-By: Tierney Cyren 
Reviewed-By: Zijian Liu 
Reviewed-By: Tobias Nießen

tools: do not mask errors on multiple commit retrieval

2021-12-30T05:57:57+00:00

In commit-queue.sh, the assignment to `commits` will succeed and the
script will continue if one of the two `git` commands fails, even with
`-e` set. Split it into three separate assignments so that failures in
the `git` commands will be clearly logged and cause the script to exit
with a failure status code.

PR-URL: https://github.com/nodejs/node/pull/41340
Reviewed-By: Tierney Cyren 
Reviewed-By: Tobias Nießen 
Reviewed-By: Franziska Hinkelmann

tools: simplify commit-queue.sh merge command

2021-12-27T14:48:07+00:00

The mergeUrl() function is only used in one place. It's a one-liner and
inlining it makes the script easier to understand, I think. It also
means no future shellcheck complaints about needing to add error
handling.

PR-URL: https://github.com/nodejs/node/pull/41314
Reviewed-By: Luigi Pinca 
Reviewed-By: Antoine du Hamel 
Reviewed-By: Gerhard Stöbich

tools: simplify and fix commit queue

2021-11-07T14:26:45+00:00

Use `gh` CLI for CI and commit queue jobs, and use the correct token
to merge PRs.

PR-URL: https://github.com/nodejs/node/pull/40742
Reviewed-By: Antoine du Hamel 
Reviewed-By: Voltrex

tools: ensure the PR was not pushed before merging

2021-11-07T11:08:22+00:00

When using Squash and Merge feature, it would allow to a malicious
actor to push unreviewed code to their PR while the CQ is running and
bypass the usual checks.
This commit adds a check to refuse to land if the head of the PR
branch is different from the one validated by ncu.

PR-URL: https://github.com/nodejs/node/pull/40747
Reviewed-By: Michaël Zasso 
Reviewed-By: Tobias Nießen 
Reviewed-By: Voltrex

tools: use GitHub Squash and Merge feature when using CQ

2021-11-06T08:14:25+00:00

PR-URL: https://github.com/nodejs/node/pull/40666
Refs: https://docs.github.com/en/rest/reference/pulls#merge-a-pull-request
Reviewed-By: Mary Marchini 
Reviewed-By: Michaël Zasso

tools: abort CQ session when landing several commits

2021-11-01T20:02:52+00:00

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: https://github.com/nodejs/node/issues/40436
Refs: https://github.com/nodejs/node-core-utils/pull/572

PR-URL: https://github.com/nodejs/node/pull/40577
Reviewed-By: Michaël Zasso 
Reviewed-By: Rich Trott

tools: avoid crashing CQ when git push fails

2021-06-11T07:59:49+00:00

PR-URL: https://github.com/nodejs/node/pull/36861
Reviewed-By: Mary Marchini