actions: Automatically merge PRs from the bot

2019-10-01 20:50:01 +02:00
parent b51a1cd249
commit e03843a985
1 changed files with 12 additions and 0 deletions
--- 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 }}"