mirror of https://github.com/nodejs/node.git
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 <oss@mmarchini.me> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com>pull/34969/head
parent
6199678d67
commit
75d943ed4a
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue