Commit 9c41247
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: #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>1 parent 137c814 commit 9c41247
1 file changed
Lines changed: 1 addition & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,10 +12,6 @@ DEFAULT_BRANCH=master | |||
| 12 | 12 | COMMIT_QUEUE_LABEL="commit-queue" | |
| 13 | 13 | COMMIT_QUEUE_FAILED_LABEL="commit-queue-failed" | |
| 14 | 14 | ||
| 15 | - mergeUrl() { | ||
| 16 | - echo "repos/${OWNER}/${REPOSITORY}/pulls/${1}/merge" | ||
| 17 | - } | ||
| 18 | - | ||
| 19 | 15 | commit_queue_failed() { | |
| 20 | 16 | pr=$1 | |
| 21 | 17 | ||
@@ -91,7 +87,7 @@ for pr in "$@"; do | |||
| 91 | 87 | --arg head "$(grep 'Fetched commits as' output | cut -d. -f3 | xargs git rev-parse)" \ | |
| 92 | 88 | '{merge_method:"squash",commit_title:$title,commit_message:$body,sha:$head}' > output.json | |
| 93 | 89 | cat output.json | |
| 94 | - if ! gh api -X PUT "$(mergeUrl "$pr")" --input output.json > output; then | ||
| 90 | + if ! gh api -X PUT "repos/${OWNER}/${REPOSITORY}/pulls/${pr}/merge" --input output.json > output; then | ||
| 95 | 91 | commit_queue_failed "$pr" | |
| 96 | 92 | continue | |
| 97 | 93 | fi | |
0 commit comments