From 4422306485c65f76b40b1e531f79a2e789fde73a Mon Sep 17 00:00:00 2001
From: Ignacio Lucero <houcros@hotmail.com>
Date: Fri, 9 Dec 2022 11:56:34 +0100
Subject: [PATCH] Revert "Rework auto-merge for Steward's PRs. (#337)"

This reverts commit 985cf8ed0b2eaef2c094de8c52e1a26725d9a87b.
---
 .github/workflows/automatic-merge.yaml | 17 +++++++++++++++++
 .github/workflows/scala-steward.yml    |  6 +-----
 2 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/automatic-merge.yaml

diff --git a/.github/workflows/automatic-merge.yaml b/.github/workflows/automatic-merge.yaml
new file mode 100644
index 0000000..919fbf9
--- /dev/null
+++ b/.github/workflows/automatic-merge.yaml
@@ -0,0 +1,17 @@
+name: Scala Steward automatic merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  scala-steward-auto-merge:
+    runs-on: ubuntu-latest
+    if: ${{ github.actor == 'scala-steward-for-moia[bot]' }}
+    steps:
+      - name: Enable auto-merge for Scala Steward PRs
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml
index 98053c8..4cfe3b2 100644
--- a/.github/workflows/scala-steward.yml
+++ b/.github/workflows/scala-steward.yml
@@ -15,14 +15,10 @@ jobs:
         with:
           app_id: 162267
           private_key: ${{ secrets.SCALA_STEWARD_APP_PRIVATE_KEY }}
+
       - name: Launch Scala Steward
         uses: scala-steward-org/scala-steward-action@v2
         with:
           github-token: ${{ steps.generate-token.outputs.token }}
           author-name: scala-steward
           author-email: 162267+scala-steward-for-moia[bot]@users.noreply.github.com
-      - name: Enable auto-merge
-        run: gh pr merge --auto --squash "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}