Changes to make auto-merge action work (#2360)

Hopefully.
elastic · Sep 3, 2024 · 58b457e · 58b457e
1 parent 132d6d6
commit 58b457e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -8,11 +8,11 @@ on:
 jobs:
   automerge:
     runs-on: ubuntu-latest
+    if: github.event.review.state == 'approved'
     steps:
       - uses: reitermarkus/automerge@v2
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GH_TOKEN }}
           merge-method: squash
-          do-not-merge-labels: never-merge
-          pull-request-author-associations: OWNER,MEMBER,COLLABORATOR
-          review-author-associations: OWNER,MEMBER,CONTRIBUTOR
+          pull-request-author-associations: OWNER
+          review-author-associations: OWNER,CONTRIBUTOR