From 91e4f03348f5f3d870e840030216194cd3d9ab0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20de=20Metz?= Date: Mon, 5 Sep 2022 17:21:00 +0200 Subject: [PATCH] Use common auto-merge action --- .github/workflows/auto-merge.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 062d5b53..ed0c276a 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -4,9 +4,13 @@ on: pull_request: types: - labeled + - unlabeled check_suite: types: - completed + status: + types: + - success permissions: write-all @@ -14,13 +18,6 @@ jobs: automerge: runs-on: ubuntu-latest steps: - - name: automerge - uses: "pascalgn/automerge-action@v0.14.3" - env: - GITHUB_TOKEN: "${{ github.token }}" - MERGE_LABELS: ":rocket: Ready to Merge" - MERGE_COMMIT_MESSAGE: "pull-request-title" - UPDATE_LABELS: ":rocket: Ready to Merge" - UPDATE_METHOD: "rebase" - MERGE_FORKS: "false" - LOG: "TRACE" + - uses: 1024pix/pix-actions/auto-merge@v0 + with: + auto_merge_token: "${{ github.token }}"