Skip to content

Commit 659c572

Browse files
authored
Merge pull request #16 from ldetmer/ldetmer-patch-5
fix: Update auto-merge.sh
2 parents a31a379 + 9d965f7 commit 659c572

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

auto-merge/auto-merge.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ merge_pr() {
2020
# Check if the PR is mergeable
2121
if jq -e '.mergeable' <<< "$response" > /dev/null; then
2222
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
23+
if [[ "$merge_response" == *"Pull Request successfully merged"* ]]; then
24+
echo "Merged PR #$pr_number"
25+
return 0
26+
else
2427
echo "Error merging PR #$pr_number:"
2528
echo "$merge_response" | jq .
2629
sleep 60
27-
else
28-
echo "Merged PR #$pr_number"
29-
return 0
3030
fi
3131
else
3232
echo "PR #$pr_number is not mergeable"

0 commit comments

Comments
 (0)