From 9325bc5d73b32659bb8f1f5d73337b44aaa2ce13 Mon Sep 17 00:00:00 2001
From: Josh Mock <joshua.mock@elastic.co>
Date: Tue, 3 Sep 2024 13:07:42 -0500
Subject: [PATCH] Update 8.15 auto-merge action to match main

---
 .github/workflows/auto-merge.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 53d4557f8..f283bd655 100644
--- 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