Update 8.15 auto-merge action to match main (#2361)

2024-09-03 13:08:33 -05:00
parent 8f028a522a
commit 15a450eba4
1 changed files with 3 additions and 2 deletions
--- 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