From c24a35db3d664bab73915f204f9f2fbb967cc945 Mon Sep 17 00:00:00 2001 From: Tonye Jack Date: Fri, 28 May 2021 11:23:59 -0400 Subject: [PATCH] Updated .github/workflows/auto-merge.yml --- .github/workflows/auto-merge.yml | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 054ff13..48912d6 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -9,25 +9,12 @@ jobs: automerge: runs-on: ubuntu-latest if: | - ( - github.event.pull_request.user.login == 'dependabot[bot]' || - github.event.pull_request.user.login == 'dependabot' || - github.event.pull_request.user.login == 'dependabot-preview[bot]' || - github.event.pull_request.user.login == 'dependabot-preview' || - github.event.pull_request.user.login == 'renovate[bot]' || - github.event.pull_request.user.login == 'renovate' || - github.event.pull_request.user.login == 'github-actions[bot]' - ) - && - ( - github.actor == 'dependabot[bot]' || - github.actor == 'dependabot' || - github.actor == 'dependabot-preview[bot]' || - github.actor == 'dependabot-preview' || - github.actor == 'renovate[bot]' || - github.actor == 'renovate' || - github.actor == 'github-actions[bot]' - ) + github.actor == 'dependabot[bot]' || + github.actor == 'dependabot' || + github.actor == 'dependabot-preview[bot]' || + github.actor == 'dependabot-preview' || + github.actor == 'renovate[bot]' || + github.actor == 'renovate' steps: - name: automerge uses: pascalgn/automerge-action@v0.14.2