Updated .github/workflows/auto-merge.yml

tj-actions · May 27, 2021 · e6d22a7 · e6d22a7
1 parent d10efff
commit e6d22a7
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -9,8 +9,25 @@ jobs:
   automerge:
     runs-on: ubuntu-latest
     if: |
-      github.actor == 'dependabot[bot]' ||
-      github.actor == 'dependabot'
+      (
+        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]'
+      )
     steps:
       - name: automerge
         uses: pascalgn/automerge-action@v0.14.2