build: fix landed message for multiple commits in commit-queue · nodejs/node@e8fcbc8 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 637
• Pull requests 761
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit e8fcbc8

Browse filesBrowse the repository at this point in the historyBrowse files

lundibundi

authored and

BethGriggs

committed

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

PR-URL: #35226 Reviewed-By: Mary Marchini <oss@mmarchini.me> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>

1 parent 863ba4b commit e8fcbc8
Copy full SHA for e8fcbc8

1 file changed

+8-2Lines changed: 8 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• tools/actions
  • commit-queue.sh

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎tools/actions/commit-queue.sh‎

Copy file name to clipboardExpand all lines: tools/actions/commit-queue.sh

+8-2Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -7,6 +7,9 @@ REPOSITORY=$2
7	7	GITHUB_TOKEN=$3
8	8	shift 3
9	9
	10	+ UPSTREAM=origin
	11	+ DEFAULT_BRANCH=master
	12	+
10	13	API_URL=https://api.github.com
11	14	COMMIT_QUEUE_LABEL='commit-queue'
12	15	COMMIT_QUEUE_FAILED_LABEL='commit-queue-failed'
@@ -77,9 +80,12 @@ for pr in "$@"; do
77	80	git node land --abort --yes
78	81	else
79	82	rm output
80		- git push origin master
81	83
82		- gitHubCurl "$(commentsUrl "$pr")" POST --data '{"body": "Landed in '"$(git rev-parse HEAD)"'"}'
	84	+ commits="$(git rev-parse $UPSTREAM/$DEFAULT_BRANCH)...$(git rev-parse HEAD)"
	85	+
	86	+ git push $UPSTREAM $DEFAULT_BRANCH
	87	+
	88	+ gitHubCurl "$(commentsUrl "$pr")" POST --data '{"body": "Landed in '"$commits"'"}'
83	89
84	90	gitHubCurl "$(issueUrl "$pr")" PATCH --data '{"state": "closed"}'
85	91	fi

0 commit comments

Comments

0 (0)