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