From e03843a9859e77fc01460dc608b75e97576aaed6 Mon Sep 17 00:00:00 2001
From: Owain van Brakel <owain.vanbrakel@gmail.com>
Date: Tue, 1 Oct 2019 20:50:01 +0200
Subject: [PATCH] actions: Automatically merge PRs from the bot

---
 .github/workflows/build.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a2309af56b..16eaeef330 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -74,5 +74,17 @@ jobs:
       - name: Approve pull request
         if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS'
         uses: hmarr/auto-approve-action@master
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+
+  merge:
+    name: Merge
+    needs: approve
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Merge pull request
+        if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS'
+        uses: managedkaos/merge-pull-request@master
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
\ No newline at end of file