actions: merge

2019-11-02 12:01:58 +01:00
parent ca63f494e2
commit 856e37bec4
4 changed files with 24 additions and 15 deletions
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -75,15 +75,4 @@ jobs:
        if: github.event_name == 'pull_request' && github.actor == 'OpenOSRS'
        uses: hmarr/auto-approve-action@v2.0.0
        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-
-  merge:
-    name: Merge
-    needs: approve
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v1
-      - uses: maxkomarychev/merge-pal-action@v0.1.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: ${{ secrets.Owain }}