From ae54d62c0299b3ab00b51146e7fa0a6e18cc83cc Mon Sep 17 00:00:00 2001
From: Adam Moussa <adam@seahavenind.com>
Date: Fri, 21 Aug 2026 18:26:30 -0400
Subject: [PATCH] fix(ci): skip bot PR authors and drop merge-token write

---
 .github/workflows/auto-merge.yaml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/auto-merge.yaml b/.github/workflows/auto-merge.yaml
index fe295b7..aa8fdcc 100644
--- a/.github/workflows/auto-merge.yaml
+++ b/.github/workflows/auto-merge.yaml
@@ -6,7 +6,6 @@ on:
     branches: [main]
 
 permissions:
-  contents: write
   pull-requests: write
 
 jobs:
@@ -14,8 +13,8 @@ jobs:
     if: >-
       github.event.pull_request.draft == false
       && github.event.pull_request.head.repo.full_name == github.repository
-      && github.actor != 'dependabot[bot]'
-      && github.actor != 'renovate[bot]'
+      && github.event.pull_request.user.login != 'dependabot[bot]'
+      && github.event.pull_request.user.login != 'renovate[bot]'
     runs-on: ubuntu-latest
     steps:
       - name: Enable squash auto-merge
@@ -29,4 +28,4 @@ jobs:
             echo "auto-merge already enabled"
             exit 0
           fi
-          gh pr merge "$PR" --repo "$REPO" --auto --squash
+          gh pr merge "$PR" --repo "$REPO" --auto