diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml index a8a074a..633887a 100644 --- a/.github/workflows/auto-merge.yaml +++ b/.github/workflows/auto-merge.yaml @@ -55,6 +55,9 @@ jobs: exit 0 fi echo "$out" + # Re-arm as seahaven-bot. A leftover GITHUB_TOKEN auto-merge would + # enqueue without starting merge_group. + gh pr merge "$PR" --repo "$REPO" --disable-auto || true if ! gh pr merge "$PR" --repo "$REPO" --auto; then if [ "$(gh pr view "$PR" --repo "$REPO" --json autoMergeRequest --jq '.autoMergeRequest != null')" = "true" ]; then echo "auto-merge already enabled"