From 69c0472d6f75153b7c90b9567bab24e815136647 Mon Sep 17 00:00:00 2001
From: pyth0n1c <87383215+pyth0n1c@users.noreply.github.com>
Date: Tue, 7 Sep 2021 17:04:37 -0700
Subject: [PATCH] Revert "New automerge action and conditional on"

---
 .github/workflows/auto-merge.yml | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 5a7456bfab..96c30258b6 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -1,17 +1,13 @@
-name: automerge
+name: auto-merge
 on:
-  pull_request:
+  pull_request_target:
 
 jobs:
-  automerge:
+  auto-merge:
     runs-on: ubuntu-latest
     steps:
-
-      - name: Print the name of the actor
-        run: |
-          echo "The name of the actor is [${{ github.actor }}]"
-      - name: automerge
-        uses: "pascalgn/automerge-action@v0.14.3"
-        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
-        env:
-          GITHUB_TOKEN: "${{ secrets.PROTECTED_BRANCH_PUSH_TOKEN }}"
\ No newline at end of file
+      - uses: actions/checkout@v2
+      - uses: ahmadnassri/action-dependabot-auto-merge@v2
+        with:
+          target: minor
+          github-token: ${{ secrets.AUTOMERGE }}