From 8362060ca9458c4bd33a3ce3fac4d9b8c2c4b2a2 Mon Sep 17 00:00:00 2001 From: Preston Date: Thu, 19 Aug 2021 17:33:23 -0400 Subject: [PATCH] Update autoMergePR.yml --- .github/workflows/autoMergePR.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/autoMergePR.yml b/.github/workflows/autoMergePR.yml index 971993c4..123cf4d8 100644 --- a/.github/workflows/autoMergePR.yml +++ b/.github/workflows/autoMergePR.yml @@ -18,8 +18,8 @@ jobs: - name: Auto-Merge Pull Request # You may pin to the exact commit or the version. # uses: reitermarkus/automerge@72bc1353d0a084c84034be23424b124d900d1658 - uses: reitermarkus/automerge@v1.5.2 + uses: reitermarkus/automerge@v2 with: - token: ${{ secrets.PUSH_TOKEN }} - # Specify which merge method to use. By default, will select the first one available in this order: `merge`, `squash`, `rebase` - merge-method: squash + token: ${{ secrets.PUSH_TOKEN }} + merge-method: squash + pull-request: ${{ github.event.inputs.pull-request }}