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: nodejs/node-core-utils#473 PR-URL: #34969 Reviewed-By: Mary Marchini <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Shelley Vohr <[email protected]>
nodejs · Sep 1, 2020 · 46766a1 · 46766a1
1 parent 7afb67f
commit 46766a1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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