File tree Expand file tree Collapse file tree 1 file changed +3
-5
lines changed Expand file tree Collapse file tree 1 file changed +3
-5
lines changed Original file line number Diff line number Diff line change @@ -57,11 +57,11 @@ jobs:
5757 mergeable=$(gh pr view "$pr_number" --json mergeable --jq '.mergeable')
5858 if [[ "$mergeable" == "CONFLICTING" ]]; then
5959 echo "❌ Merge conflicts detected. Rebasing PR #$pr_number"
60- gh pr rebase "$pr_url" || echo "❗ Rebase failed."
60+ gh pr update-branch "$pr_url" || echo "❗ Rebase (update-branch) failed."
6161 fi
6262 done < matched_prs.txt
6363
64- - name : Approve and Auto-Merge if Mergeable
64+ - name : Auto-Merge if Mergeable
6565 if : success()
6666 env :
6767 GH_TOKEN : ${{ secrets.GITHUB_TOKEN }}
8181 mergeable=$(gh pr view "$pr_number" --json mergeable --jq '.mergeable' 2>/dev/null || echo "UNKNOWN")
8282 echo "🔁 Attempt $((attempt+1))/$max_attempts: mergeable=$mergeable"
8383 if [[ "$mergeable" == "MERGEABLE" ]]; then
84- echo "✅ PR is mergeable. Approving..."
85- gh pr review --approve "$pr_url" || echo "❗ Approval failed."
8684 echo "🚀 Enabling auto-merge..."
8785 set -x
8886 merge_output=$(gh pr merge --auto --merge "$pr_url" 2>&1)
@@ -107,4 +105,4 @@ jobs:
107105 if [[ "$mergeable" != "MERGEABLE" && "$mergeable" != "CONFLICTING" ]]; then
108106 echo "❌ Mergeability undetermined after $max_attempts attempts. Skipping PR #$pr_number"
109107 fi
110- done < matched_prs.txt || echo "⚠️ Completed loop with some errors, but continuing gracefully."
108+ done < matched_prs.txt || echo "⚠️ Completed loop with some errors, but continuing gracefully."
You can’t perform that action at this time.
0 commit comments