From 280b66b0fbfdd87eb0223c756a12a474ce553e1e Mon Sep 17 00:00:00 2001
From: ThatGamerBlue <thatgamerblue@gmail.com>
Date: Tue, 31 Mar 2020 16:54:49 +0100
Subject: [PATCH] actions: update automerge

---
 .github/workflows/merge.yml | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index f7931e242b..f51ee4de4f 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -12,26 +12,10 @@ jobs:
 
     steps:
       - name: automerge
-        uses: pascalgn/automerge-action@f84dd310ea4a19890c70a4ff11ab282a872fb94b
+        uses: pascalgn/automerge-action@v0.8.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          MERGE_FORKS: false
-          LABELS: automated-pull-request
-          AUTOMERGE: automated-pull-request
-          
-  cleanup:
-    name: Cleanup
-    needs: automerge
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Extract branch name
-        shell: bash
-        run: echo "##[set-output name=branch;]$(echo $(jq --raw-output .pull_request.head.ref "$GITHUB_EVENT_PATH"))"
-        id: extract_branch
-      - name: Delete PR head branch
-        uses: dawidd6/action-delete-branch@master
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ steps.extract_branch.outputs.branch }}
-          be_kind: true
+          MERGE_FORKS: "false"
+          MERGE_LABELS: "automated-pull-request"
+          MERGE_REMOVE_LABELS: ""
+          MERGE_DELETE_BRANCH: "true"