tools: use github cli to squash the pr

bjohansebas · bjohansebas · commit e8633dd49fee · 2025-04-06T12:34:50.000-05:00
diff --git a/tools/actions/commit-queue.sh b/tools/actions/commit-queue.sh
@@ -82,18 +82,11 @@ for pr in "$@"; do
     fi
   else
     # If there's only one commit, we can use the Squash and Merge feature from GitHub.
-    # TODO: use `gh pr merge` when the GitHub CLI allows to customize the commit title (https://github.com/cli/cli/issues/1023).
     commit_title=$(git log -1 --pretty='format:%s')
     commit_body=$(git log -1 --pretty='format:%b')
     commit_head=$(grep 'Fetched commits as' output | cut -d. -f3 | xargs git rev-parse)
 
-    jq -n \
-      --arg title "${commit_title}" \
-      --arg body "${commit_body}" \
-      --arg head "${commit_head}" \
-      '{merge_method:"squash",commit_title:$title,commit_message:$body,sha:$head}' > output.json
-    cat output.json
-    if ! gh api -X PUT "repos/${OWNER}/${REPOSITORY}/pulls/${pr}/merge" --input output.json > output; then
+    if ! gh pr merge "$pr" --squash --body "$commit_body" --subject "$commit_title" --match-head-commit "$commit_head" --admin > output; then
       commit_queue_failed "$pr"
       continue
     fi
@@ -102,7 +95,6 @@ for pr in "$@"; do
       commit_queue_failed "$pr"
       continue
     fi
-    rm output.json
   fi
 
   rm output
diff --git a/tools/actions/merge.sh b/tools/actions/merge.sh
@@ -39,24 +39,18 @@ git log -1 HEAD^ --pretty='format:%B' | git interpret-trailers --parse --no-divi
 commit_title=$(git log -1 --pretty='format:%s')
 commit_body=$(git log -1 --pretty='format:%b')
 
-jq -n \
-    --arg title "${commit_title}" \
-    --arg body "${commit_body}" \
-    --arg head "${commit_head}" \
-    '{merge_method:"squash",commit_title:$title,commit_message:$body,sha:$head}' > output.json
-cat output.json
-if ! gh api -X PUT "repos/${OWNER}/${REPOSITORY}/pulls/${pr}/merge" --input output.json > output; then
+if ! gh pr merge "$pr" --squash --body "$commit_body" --subject "$commit_title" --match-head-commit "$commit_head" --admin > output; then
     cat output
     echo "Failed to merge $pr"
-    rm output output.json
+    rm output
     exit 1
 fi
 cat output
 if ! commits="$(jq -r 'if .merged then .sha else error("not merged") end' < output)"; then
     echo "Failed to merge $pr"
-    rm output output.json
+    rm output
     exit 1
 fi
-rm output.json output
+rm output
 
 gh pr comment "$pr" --repo "$OWNER/$REPOSITORY" --body "Landed in $commits"
