Commit 46766a1
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 <oss@mmarchini.me>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>1 parent 7afb67f commit 46766a1
2 files changed
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -43,7 +43,10 @@ The Commit Queue feature is still in early stages, and as such it might not | |||
| 43 | 43 | work for more complex Pull Requests. These are the currently known limitations | |
| 44 | 44 | of the commit queue: | |
| 45 | 45 | ||
| 46 | - 1. The Pull Request must have only one commit | ||
| 46 | + 1. All commits in a Pull Request must either be following commit message | ||
| 47 | + guidelines or be a valid [`fixup!`](https://git-scm.com/docs/git-commit#Documentation/git-commit.txt---fixupltcommitgt) | ||
| 48 | + commits that will be correctly handled by [`--autosquash`](https://git-scm.com/docs/git-rebase#Documentation/git-rebase.txt---autosquash) | ||
| 49 | + option | ||
| 47 | 50 | 2. A CI must've ran and succeeded since the last change on the PR | |
| 48 | 51 | 3. A Collaborator must have approved the PR since the last change | |
| 49 | 52 | 4. Only Jenkins CI is checked (Actions, V8 CI and CITGM are ignored) | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -55,7 +55,7 @@ for pr in "$@"; do | |||
| 55 | 55 | # Delete the commit queue label | |
| 56 | 56 | gitHubCurl "$(labelsUrl "$pr")"/"$COMMIT_QUEUE_LABEL" DELETE | |
| 57 | 57 | ||
| 58 | - git node land --yes "$pr" >output 2>&1 || echo "Failed to land #${pr}" | ||
| 58 | + git node land --autorebase --yes "$pr" >output 2>&1 || echo "Failed to land #${pr}" | ||
| 59 | 59 | # cat here otherwise we'll be supressing the output of git node land | |
| 60 | 60 | cat output | |
| 61 | 61 | ||
0 commit comments