Commit Graph
56 Commits
Author SHA1 Message Date
Filip Skokan 7276858621 tools: label PRs lacking second approval
Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/65538
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Tierney Cyren <hello@bnb.im>
2026-08-27 23:41:51 +02:00
Filip Skokan f411275331 tools: improve commit queue failure comment
Commit Queue failure comments hid the actionable reason inside the
collapsed landing transcript.

Surface the reason and retry instructions before the full output. Add
specific guidance for a missing multi-commit policy and explicit reasons
for push and squash-merge failures.

Signed-off-by: Filip Skokan <panva.ip@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/65433
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
2026-08-22 14:24:44 +00:00
Antoine du Hamel b4fa29a6f1 tools: fix max body length handler in create-release-proposal.sh
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/65455
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Richard Lau <richard.lau@ibm.com>
2026-08-21 15:01:39 +00:00
Antoine du Hamel 12eb296a31 tools: make env variables consistent in cron jobs
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/65168
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
2026-08-20 19:15:56 +00:00
Antoine du Hamel e53d87a57c tools: remove skip logic in commit-queue.sh
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/65162
Reviewed-By: Jithil P Ponnan <jithil@outlook.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
2026-08-11 10:56:18 +00:00
Antoine du Hamel 21b28801a5 tools: delay removal of commit-queue label
The removes the possiblity for a PR to drop from the queue if the CQ job
is cancelled (or times out) in the middle of handling a PR.
This increases the window for two concurrent CQ jobs to pick up the same
PR, but that's an unlikely scenario.

Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/65101
Refs: https://github.com/nodejs/node/issues/64972
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Aviv Keller <me@aviv.sh>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
2026-08-09 10:42:30 +00:00
Antoine du Hamel d7ed670da2 tools: lazy-abort failed PR merges in CQ
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/65004
Refs: https://github.com/nodejs/node/issues/64972
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
2026-08-07 09:16:36 +00:00
Stewart X Addison 61b8e12451 tools: reference 'git node land' in PR-URL: error message in merge.sh
Signed-off-by: Stewart X Addison <sxa@ibm.com>
PR-URL: https://github.com/nodejs/node/pull/64495
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
2026-07-16 19:13:41 +01:00
Antoine du Hamel 9f0a3e636b tools: improve backport review script
Signed-off-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/62573
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
2026-04-10 20:04:30 +00:00
Antoine du Hamel fbf82766d6 tools: adopt the --check-for-duplicates NCU flag
PR-URL: https://github.com/nodejs/node/pull/62478
Refs: https://github.com/nodejs/node-core-utils/pull/1035
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: René <contact.9a5d6388@renegade334.me.uk>
2026-03-30 14:50:32 +00:00
Richard Lau 7c4dc34c28 tools: fix example in release proposal linter
`changelog-maker` writes 10 character length short form SHA's.
Explicitly set the `git log format` in the example to match.

PR-URL: https://github.com/nodejs/node/pull/62074
Reviewed-By: Tierney Cyren <hello@bnb.im>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ulises Gascón <ulisesgascongonzalez@gmail.com>
Reviewed-By: Stewart X Addison <sxa@redhat.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
2026-03-04 16:43:14 +00:00
Antoine du Hamel 6322071efe tools: improve log output of create-release-proposal
PR-URL: https://github.com/nodejs/node/pull/61028
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Richard Lau <richard.lau@ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
2025-12-14 11:26:36 +00:00
Antoine du Hamel 3c248c3556 tools: fix linter for semver-major release proposals
PR-URL: https://github.com/nodejs/node/pull/60481
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <richard.lau@ibm.com>
2025-11-01 07:11:01 +00:00
Antoine du Hamel fdcf4d9454 tools: fix failing release-proposal linter for LTS transitions
PR-URL: https://github.com/nodejs/node/pull/60465
Reviewed-By: Richard Lau <richard.lau@ibm.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
2025-10-30 17:29:10 +00:00
Antoine du Hamel 0a46aa9e5d tools: add script to make reviewing backport PRs easier
PR-URL: https://github.com/nodejs/node/pull/59161
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
2025-08-26 22:49:24 +00:00
Antoine du Hamel 38c2b926af tools: add support for URLs to PR commits in merge.sh
PR-URL: https://github.com/nodejs/node/pull/59162
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
2025-07-24 09:44:33 +00:00
Antoine du Hamel 4dafa7747f tools: ignore CVE mention when linting release proposals
PR-URL: https://github.com/nodejs/node/pull/59037
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
2025-07-13 19:45:02 +00:00
Antoine du Hamel 3a7f8efe60 tools: improve release proposal linter
PR-URL: https://github.com/nodejs/node/pull/58647
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Tierney Cyren <hello@bnb.im>
Reviewed-By: Xuguang Mei <meixuguang@gmail.com>
2025-06-11 15:02:35 +00:00
Antoine du HamelandRafaelGSS 99dc2d376a tools: add semver-major release support to release-lint
Co-authored-by: RafaelGSS <rafael.nunu@hotmail.com>
Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/57892
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
2025-04-21 06:33:57 +00:00
Elves Vieira 958fd912d5 tools: edit create-release-proposal workflow to handle pr body length
PR-URL: https://github.com/nodejs/node/pull/57841
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
2025-04-14 12:54:17 +00:00
Antoine du Hamel d5b3dbb0f5 tools: do not use temp files when merging PRs
PR-URL: https://github.com/nodejs/node/pull/57790
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
2025-04-10 22:37:31 +00:00
Antoine du Hamel 7409a1dcc4 tools: edit create-release-proposal workflow
Small cleanup edits.

PR-URL: https://github.com/nodejs/node/pull/56540
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
2025-01-11 22:55:07 +00:00
Antoine du Hamel e1df1e061e tools: validate commit list as part of lint-release-commit
PR-URL: https://github.com/nodejs/node/pull/56291
Reviewed-By: James M Snell <jasnell@gmail.com>
2025-01-09 22:07:53 +00:00
Antoine du Hamel 821ab6ff30 tools: add release line label when opening release proposal
PR-URL: https://github.com/nodejs/node/pull/56317
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
2024-12-21 15:29:41 +00:00
Antoine du Hamel 80c0055e38 tools: use commit title as PR title when creating release proposal
PR-URL: https://github.com/nodejs/node/pull/56165
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
2024-12-09 11:10:51 +00:00
Antoine du Hamel 4f51d461d1 tools: improve release proposal PR opening
- Open as draft. The releaser should review the PR and mark it as ready.
- Add the "release" label.
- Assign the releaser to the PR so it's clearer who's in charge and
  they can find it more easily. This will also notify and subscribe
  them to the PR.

PR-URL: https://github.com/nodejs/node/pull/56161
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
2024-12-08 19:34:31 +00:00
Antoine du Hamel 60e9c6f441 tools: update create-release-proposal workflow
PR-URL: https://github.com/nodejs/node/pull/56054
Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
2024-12-05 20:33:44 +00:00
Rafael Gonzaga c75aaac733 build: add create release proposal action
PR-URL: https://github.com/nodejs/node/pull/55690
Refs: https://github.com/nodejs/security-wg/issues/860
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
2024-11-23 16:48:46 +00:00
Nathan Baulch 0f375db9c6 tools: fix typos
PR-URL: https://github.com/nodejs/node/pull/55061
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
2024-10-15 13:59:49 +00:00
Antoine du Hamel 13d6950a6c tools: add util scripts to land and rebase PRs
PR-URL: https://github.com/nodejs/node/pull/54656
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: LiviaMedeiros <livia@cirno.name>
2024-09-06 09:08:24 +02:00
Aviv Keller 53483a1344 meta: use HTML entities in commit-queue comment
PR-URL: https://github.com/nodejs/node/pull/53744
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
2024-07-08 16:29:43 +00:00
Antoine du Hamel 3fe35dc5af Revert "tools: add --certify-safe to nci-ci"
This reverts commit 0fa07d4442.

PR-URL: https://github.com/nodejs/node/pull/53098
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Marco Ippolito <marcoippolito54@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
2024-05-24 09:47:50 +00:00
Matteo Collina 0fa07d4442 tools: add --certify-safe to nci-ci
Signed-off-by: Matteo Collina <hello@matteocollina.com>
PR-URL: https://github.com/nodejs/node/pull/52940
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
2024-05-12 06:33:11 +00:00
Antoine du Hamel a3874dd637 tools: fix request-ci-failed comment
PR-URL: https://github.com/nodejs/node/pull/45291
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
2022-11-03 02:14:40 +00:00
Antoine du Hamel 1422e51a5b tools: fix request-ci-failed comment
Refs: https://github.com/nodejs/node/pull/45209#issuecomment-1294239904
PR-URL: https://github.com/nodejs/node/pull/45218
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
2022-10-28 11:45:35 +00:00
Feng Yu b6c6cc7000 tools: update main branch name
PR-URL: https://github.com/nodejs/node/pull/43440
Refs: https://github.com/nodejs/node/issues/33864
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: LiviaMedeiros <livia@cirno.name>
Reviewed-By: Beth Griggs <bgriggs@redhat.com>
Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com>
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
2022-06-17 08:48:18 +01:00
Xuguang Mei 8f07452206 tools: fix skip PR if CI is still running
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 <duhamelantoine1995@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: Mestery <mestery@protonmail.com>
2022-03-21 04:33:11 +00:00
Rich Trott 5f07d00c60 tools: remove last of error-masking in commit-queue.sh
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 <luigipinca@gmail.com>
Reviewed-By: Tierney Cyren <hello@bnb.im>
Reviewed-By: Zijian Liu <lxxyxzj@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
2022-01-01 17:25:36 +00:00
Rich Trott e7a924e086 tools: do not mask errors on multiple commit retrieval
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 <hello@bnb.im>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
2021-12-30 05:57:57 +00:00
Rich Trott 67cd4a61ac tools: simplify commit-queue.sh merge command
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 <luigipinca@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
2021-12-27 14:48:07 +00:00
Rich Trott 5cc4b69fd4 tools: be intentional about masking possible error in start-ci.sh
Revise start-ci.sh to conform with shellcheck 0.8.0 default checks.

Refs: https://www.shellcheck.net/wiki/SC2312

PR-URL: https://github.com/nodejs/node/pull/41284
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
2021-12-24 19:25:06 +00:00
Michaël Zasso 873119385f tools: simplify and fix commit queue
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 <duhamelantoine1995@gmail.com>
Reviewed-By: Voltrex <mohammadkeyvanzade94@gmail.com>
2021-11-07 15:26:45 +01:00
Antoine du Hamel 96e00e03cf tools: ensure the PR was not pushed before merging
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 <targos@protonmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Voltrex <mohammadkeyvanzade94@gmail.com>
2021-11-07 12:08:22 +01:00
Antoine du Hamel 80b8440656 tools: use GitHub Squash and Merge feature when using CQ
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 <oss@mmarchini.me>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
2021-11-06 08:14:25 +00:00
Antoine du Hamel 9bd6d526e6 tools: abort CQ session when landing several commits
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 <targos@protonmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
2021-11-01 21:02:52 +01:00
Antoine du Hamel 240c8bc190 tools: avoid crashing CQ when git push fails
PR-URL: https://github.com/nodejs/node/pull/36861
Reviewed-By: Mary Marchini <oss@mmarchini.me>
2021-06-11 07:59:49 +00:00
bl-ue 5e5bb69338 tools: fix typo in commit-queue.sh
PR-URL: https://github.com/nodejs/node/pull/39000
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Zijian Liu <lxxyxzj@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
2021-06-11 06:02:23 +00:00
Antoine du Hamel 0e96dc1f95 tools: lint shell scripts
PR-URL: https://github.com/nodejs/node/pull/36099
Reviewed-By: Rich Trott <rtrott@gmail.com>
2020-12-16 23:45:26 +01:00
Antoine du Hamel 08be03b7cb tools: hide commit queue action link
PR-URL: https://github.com/nodejs/node/pull/36124
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
2020-11-17 00:01:43 +00:00
Antoine du Hamel ac5df63952 build: fix Commit Queue failure comment
Refs: https://github.com/nodejs/node/pull/35206

PR-URL: https://github.com/nodejs/node/pull/35599
Reviewed-By: Denys Otrishko <shishugi@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
2020-10-14 06:11:13 -07:00