tools: simplify commit-queue.sh merge command

The mergeUrl() function is only used in one place. It's a one-liner and
inlining it makes the script easier to understand, I think. It also
means no future shellcheck complaints about needing to add error
handling.

PR-URL: https://github.com/nodejs/node/pull/41314
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
This commit is contained in:
Rich Trott
2021-12-27 06:48:07 -08:00
committed by GitHub
parent 4624cef455
commit 67cd4a61ac

View File

@@ -12,10 +12,6 @@ DEFAULT_BRANCH=master
COMMIT_QUEUE_LABEL="commit-queue"
COMMIT_QUEUE_FAILED_LABEL="commit-queue-failed"
mergeUrl() {
echo "repos/${OWNER}/${REPOSITORY}/pulls/${1}/merge"
}
commit_queue_failed() {
pr=$1
@@ -91,7 +87,7 @@ for pr in "$@"; do
--arg head "$(grep 'Fetched commits as' output | cut -d. -f3 | xargs git rev-parse)" \
'{merge_method:"squash",commit_title:$title,commit_message:$body,sha:$head}' > output.json
cat output.json
if ! gh api -X PUT "$(mergeUrl "$pr")" --input output.json > output; then
if ! gh api -X PUT "repos/${OWNER}/${REPOSITORY}/pulls/${pr}/merge" --input output.json > output; then
commit_queue_failed "$pr"
continue
fi