diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index e299d6329..b05d90708 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -1,28 +1,28 @@ # Uses https://github.com/pascalgn/automerge-action and https://github.com/actions/labeler name: Auto-merge -on: +on: pull_request: types: [ opened, synchronize, reopened ] check_suite: types: [ completed ] permissions: write-all - - + + jobs: automerge: runs-on: ubuntu-latest - steps: + steps: - name: Auto-label uses: actions/labeler@v4 with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - + repo-token: ${{ secrets.AUTOMERGE_PAT }} + - name: Auto-merge uses: pascalgn/automerge-action@v0.15.6 env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.AUTOMERGE_PAT }} MERGE_LABELS: "automerge,!work in progress,!ready for review" MERGE_REMOVE_LABELS: "automerge" LOG: DEBUG