Updated .github/workflows/auto-merge.yml

tj-django · May 27, 2021 · 0493ae5 · 0493ae5
1 parent 7a7e443
commit 0493ae5
Showing 1 changed file with 23 additions and 4 deletions.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -9,10 +9,29 @@ jobs:
   automerge:
     runs-on: ubuntu-latest
     if: |
-      github.actor == 'pre-commit-ci' ||
-      github.actor == 'pre-commit-ci[bot]' ||
-      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 == 'pre-commit-ci' ||
+        github.event.pull_request.user.login == 'pre-commit-ci[bot]' ||
+        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 == 'pre-commit-ci' ||
+        github.actor == 'pre-commit-ci[bot]' ||
+        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