From 6199678d67d2fff59d4d650aa3ebb8057b279aa3 Mon Sep 17 00:00:00 2001 From: Denys Otrishko Date: Sat, 29 Aug 2020 12:37:21 +0300 Subject: [PATCH 1/2] build: use latest node-core-utils from npm PR-URL: https://github.com/nodejs/node/pull/34969 Reviewed-By: Mary Marchini Reviewed-By: Luigi Pinca Reviewed-By: Shelley Vohr --- .github/workflows/commit-queue.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/commit-queue.yml b/.github/workflows/commit-queue.yml index 9db520d5c35a59..6f4affe656c9a1 100644 --- a/.github/workflows/commit-queue.yml +++ b/.github/workflows/commit-queue.yml @@ -35,9 +35,7 @@ jobs: - name: Install dependencies run: | sudo apt-get install jq -y - # TODO(mmarchini): install from npm after next ncu release is out - npm install -g 'https://github.com/mmarchini/node-core-utils#commit-queue-branch' - # npm install -g node-core-utils + npm install -g node-core-utils@latest - name: Set variables run: | From 75d943ed4a51cee92d92f9bdd1e0c563bea583ae Mon Sep 17 00:00:00 2001 From: Denys Otrishko Date: Sat, 29 Aug 2020 12:38:56 +0300 Subject: [PATCH 2/2] build: use autorebase option for git node land This will allow to land commits with multiple commits and also properly handle proper `fixup` commits. Refs: https://github.com/nodejs/node-core-utils/pull/473 PR-URL: https://github.com/nodejs/node/pull/34969 Reviewed-By: Mary Marchini Reviewed-By: Luigi Pinca Reviewed-By: Shelley Vohr --- doc/guides/commit-queue.md | 5 ++++- tools/actions/commit-queue.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/guides/commit-queue.md b/doc/guides/commit-queue.md index da3d7e6de74263..b66e71520d0c71 100644 --- a/doc/guides/commit-queue.md +++ b/doc/guides/commit-queue.md @@ -43,7 +43,10 @@ The Commit Queue feature is still in early stages, and as such it might not work for more complex Pull Requests. These are the currently known limitations of the commit queue: -1. The Pull Request must have only one commit +1. All commits in a Pull Request must either be following commit message + guidelines or be a valid [`fixup!`](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---fixupltcommitgt) + commits that will be correctly handled by [`--autosquash`](https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---autosquash) + option 2. A CI must've ran and succeeded since the last change on the PR 3. A Collaborator must have approved the PR since the last change 4. Only Jenkins CI is checked (Actions, V8 CI and CITGM are ignored) diff --git a/tools/actions/commit-queue.sh b/tools/actions/commit-queue.sh index f572089e2d5fca..028297217469a0 100755 --- a/tools/actions/commit-queue.sh +++ b/tools/actions/commit-queue.sh @@ -55,7 +55,7 @@ for pr in "$@"; do # Delete the commit queue label gitHubCurl "$(labelsUrl "$pr")"/"$COMMIT_QUEUE_LABEL" DELETE - git node land --yes "$pr" >output 2>&1 || echo "Failed to land #${pr}" + git node land --autorebase --yes "$pr" >output 2>&1 || echo "Failed to land #${pr}" # cat here otherwise we'll be supressing the output of git node land cat output