build: fix landed message for multiple commits in commit-queue

PR-URL: #35226 Reviewed-By: Mary Marchini <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]>
nodejs · Oct 14, 2020 · e8fcbc8 · e8fcbc8
1 parent 863ba4b
commit e8fcbc8
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/tools/actions/commit-queue.sh b/tools/actions/commit-queue.sh
@@ -7,6 +7,9 @@ REPOSITORY=$2
 GITHUB_TOKEN=$3
 shift 3
 
+UPSTREAM=origin
+DEFAULT_BRANCH=master
+
 API_URL=https://api.github.com
 COMMIT_QUEUE_LABEL='commit-queue'
 COMMIT_QUEUE_FAILED_LABEL='commit-queue-failed'
@@ -77,9 +80,12 @@ for pr in "$@"; do
     git node land --abort --yes
   else
     rm output
-    git push origin master
 
-    gitHubCurl "$(commentsUrl "$pr")" POST --data '{"body": "Landed in '"$(git rev-parse HEAD)"'"}'
+    commits="$(git rev-parse $UPSTREAM/$DEFAULT_BRANCH)...$(git rev-parse HEAD)"
+
+    git push $UPSTREAM $DEFAULT_BRANCH
+
+    gitHubCurl "$(commentsUrl "$pr")" POST --data '{"body": "Landed in '"$commits"'"}'
 
     gitHubCurl "$(issueUrl "$pr")" PATCH --data '{"state": "closed"}'
   fi