From cc9e8a0514ff473edfbfd62f9f77885fd2cb1f83 Mon Sep 17 00:00:00 2001 From: Jamie Wilkinson Date: Wed, 16 Dec 2020 16:03:59 +1100 Subject: [PATCH] Don't automerge jaqx0r's changes as actions don't work on forks. See https://github.com/pascalgn/automerge-action/issues/46 for gory details. Hope springs from github/roadmap#107 --- .github/workflows/automerge.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index a2f5c23dc..02d10f4aa 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -1,3 +1,6 @@ +# This doesn't work on forked repos per the discussion in +# https://github.com/pascalgn/automerge-action/issues/46 so don't attempt to +# add people other than dependabot to the if field below. name: automerge on: pull_request: @@ -22,14 +25,11 @@ jobs: runs-on: ubuntu-latest steps: - name: automerge - if: github.actor == 'jaqx0r' || github.actor == 'dependabot[bot]' + if: github.actor == 'dependabot[bot]' uses: "pascalgn/automerge-action@v0.12.0" - with: - args: "--trace" env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - MERGE_METHOD: "merge" + MERGE_METHOD: "rebase" MERGE_LABELS: "" - MERGE_FORKS: "true" MERGE_RETRY_SLEEP: "60000" MERGE_RETRIES: "61"