Skip to content

fix: Update auto-merge.sh #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ldetmer merged 1 commit into from
Dec 23, 2024
Merged

fix: Update auto-merge.sh #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions auto-merge/auto-merge.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ merge_pr() {
# Check if the PR is mergeable
if jq -e '.mergeable' <<< "$response" > /dev/null; then
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)
if [[ "$merge_response" == *"message"* ]]; then
if [[ "$merge_response" == *"Pull Request successfully merged"* ]]; then
echo "Merged PR #$pr_number"
return 0
else
echo "Error merging PR #$pr_number:"
echo "$merge_response" | jq .
sleep 60
else
echo "Merged PR #$pr_number"
return 0
fi
else
echo "PR #$pr_number is not mergeable"
Expand Down