From b6647e94ba91a592c67383765ef0dd158e621e22 Mon Sep 17 00:00:00 2001 From: Marc Durdin Date: Sat, 1 Feb 2020 13:41:06 +1100 Subject: [PATCH] chore: use alternate automerge The previous one failed with errors, e.g. https://github.com/keymanapp/keyman/pull/2563/checks?check_run_id=420416770. It's a known, unaddressed issue. --- .github/workflows/auto-merge-keyman-server-pr.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto-merge-keyman-server-pr.yml b/.github/workflows/auto-merge-keyman-server-pr.yml index 68f9a959e5..622e680992 100644 --- a/.github/workflows/auto-merge-keyman-server-pr.yml +++ b/.github/workflows/auto-merge-keyman-server-pr.yml @@ -21,8 +21,9 @@ jobs: with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: auto merge PR from keyman-server - uses: ridedott/merge-me-action@v1.1.3 + uses: "pascalgn/automerge-action@7854d3bd607dccdaf0b2c134b699a812c8960213" if: github.actor == 'keyman-server' - with: - GITHUB_LOGIN: keyman-server + env: GITHUB_TOKEN: "${{ secrets.AUTOINC_GITHUB_TOKEN }}" + MERGE_LABELS: "" + MERGE_FORKS: false