File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -19,9 +19,15 @@ merge_pr() {
1919 local response=$( curl -s -H " Authorization: token $token " -H " Accept: application/vnd.github+json" " https://api.github.com/repos/$REPO /pulls/$pr_number " )
2020 # Check if the PR is mergeable
2121 if jq -e ' .mergeable' <<< " $response" > /dev/null; then
22- curl -s -X PUT -H " Authorization: token $token " -H " Accept: application/vnd.github+json" " https://api.github.com/repos/$REPO /pulls/$pr_number /merge" > /dev/null
23- echo " Merged PR #$pr_number "
24- break
22+ local merge_response=$( curl -s -X PUT -H " Authorization: token $token " -H " Accept: application/vnd.github+json" " https://api.github.com/repos/$REPO /pulls/$pr_number /merge" 2>&1 )
23+ if [[ " $merge_response " == * " message" * ]]; then
24+ echo " Error merging PR #$pr_number :"
25+ echo " $merge_response " | jq .
26+ sleep 60
27+ else
28+ echo " Merged PR #$pr_number "
29+ return 0
30+ fi
2531 else
2632 echo " PR #$pr_number is not mergeable"
2733 sleep 60
You can’t perform that action at this time.
0 commit comments