4

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

Author: tobiasKaminsky

.github/workflows/autoMerge.yml

@@ -27,7 +27,7 @@ jobs:
         with:
             ref: ${{ github.head_ref }}
       # Enable GitHub auto merge
-      - name: Enable Pull Request Automerge
-        run: gh pr merge --merge --auto
-        env:
-          GH_TOKEN: ${{ secrets.AUTOMERGE }}
+#      - name: Enable Pull Request Automerge
+#        run: gh pr merge --merge --auto
+#        env:
+#          GH_TOKEN: ${{ secrets.AUTOMERGE }}

.github/workflows/renovate-approve-merge.yml

@@ -9,7 +9,7 @@
 name: Auto approve renovate PRs
 
 on:
-  pull_request: # zizmor: ignore[dangerous-triggers]
+  pull_request_target: # zizmor: ignore[dangerous-triggers]
     branches:
       - main
       - master
@@ -18,13 +18,44 @@ on:
 permissions:
   contents: read
 
+concurrency:
+  group: renovate-approve-merge-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   auto-approve-merge:
+    if: github.event.pull_request.user.login == 'renovate[bot]'
     runs-on: ubuntu-latest
+    permissions:
+      # for hmarr/auto-approve-action to approve PRs
+      pull-requests: write
+      # for alexwilson/enable-github-automerge-action to approve PRs
+      contents: write
 
     steps:
+      - name: Disabled on forks
+        if: ${{ github.event.pull_request.head.repo.full_name != github.repository }}
+        run: |
+          echo 'Can not approve PRs from forks'
+          exit 1
+
+      - uses: mdecoleman/pr-branch-name@55795d86b4566d300d237883103f052125cc7508 # v3.0.0
+        id: branchname
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      # GitHub actions bot approve
+      - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
+        if: startsWith(steps.branchname.outputs.branch, 'renovate/')
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          ref: ${{ github.head_ref }}
+
       # Enable GitHub auto merge
       - name: Enable Pull Request Automerge
         run: gh pr merge --merge --auto
         env:
-          GH_TOKEN: ${{ secrets.AUTOMERGE }}
+            GH_TOKEN: ${{ secrets.AUTOMERGE }}