Update 8.15 auto-merge action to match main

elastic · Sep 3, 2024 · 9325bc5 · 9325bc5
1 parent 8f028a5
commit 9325bc5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -8,10 +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
+          review-author-associations: OWNER,CONTRIBUTOR