actions: merge

.github/workflows/gradle.yml

@@ -22,7 +22,7 @@ jobs:
           PULL_REQUEST_TITLE: 'project: Update gradle wrapper'
           PULL_REQUEST_BODY: This is an auto-generated PR with an updated gradle version
           COMMIT_MESSAGE: 'project: Update gradle wrapper'
-          PULL_REQUEST_LABELS: automated pull request, gradle
+          PULL_REQUEST_LABELS: automated-pull-request, gradle
 
   update-dependencies:
     runs-on: ubuntu-latest
@@ -41,4 +41,4 @@ jobs:
           PULL_REQUEST_TITLE: 'project: Update gradle dependencies'
           PULL_REQUEST_BODY: This is an auto-generated PR with an updated gradle dependencies versions
           COMMIT_MESSAGE: 'project: Update gradle dependencies'
-          PULL_REQUEST_LABELS: automated pull request, gradle
+          PULL_REQUEST_LABELS: automated-pull-request, gradle

.github/workflows/merge.yml

@@ -0,0 +1,20 @@
+name: OpenOSRS - Auto merge
+
+on:
+  pull_request_review:
+    types:
+      - submitted
+
+jobs:
+  automerge:
+    name: Auto merge
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: automerge
+        uses: pascalgn/automerge-action@f84dd310ea4a19890c70a4ff11ab282a872fb94b
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MERGE_FORKS: false
+          LABELS: automated-pull-request
+          AUTOMERGE: automated-pull-request

.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 }}"
+          github-token: ${{ secrets.Owain }}
-
-  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/workflows/scraper.yml

@@ -36,4 +36,4 @@ jobs:
           PULL_REQUEST_TITLE: 'Client: Update NPC stats'
           PULL_REQUEST_BODY: This is an auto-generated PR with changes from the OSRS wiki
           COMMIT_MESSAGE: 'Client: Update NPC stats'
-          PULL_REQUEST_LABELS: automated pull request, NPC stats
+          PULL_REQUEST_LABELS: automated-pull-request, NPC stats