tools: use GitHub Squash and Merge feature when using CQ

nodejs · Nov 4, 2021 · c3438ed · c3438ed
1 parent aa4adaf
commit c3438ed
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/tools/actions/commit-queue.sh b/tools/actions/commit-queue.sh
@@ -114,7 +114,7 @@ for pr in "$@"; do
     cat output.json
     gitHubCurl "$(mergeUrl "$pr")" PUT --data @output.json > output
     cat output
-    if ! commits="$(jq 'if .merged then .sha else error("not merged") end' < output)"; then
+    if ! commits="$(jq -r 'if .merged then .sha else error("not merged") end' < output)"; then
       commit_queue_failed "$pr"
       continue
     fi