From c90c64438a3c4be405580b9b057f388dbc1ee8b9 Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 22 Aug 2024 10:39:57 -0600
Subject: [PATCH 1/2] allow write and use automatic token

---
 .github/workflows/auto-merge.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 2b9c9a2..f57745c 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -3,6 +3,9 @@ name: auto-merge
 on:
   pull_request_target:
 
+permissions:
+  pull-requests: write
+
 jobs:
   auto-merge:
     runs-on: ubuntu-latest
@@ -10,7 +13,7 @@ jobs:
     steps:
     - uses: ahmadnassri/action-dependabot-auto-merge@v2.6
       with:
-        github-token: '${{ secrets.RHACS_BOT_GITHUB_TOKEN }}'
+        github-token: '${{ secrets.GITHUB_TOKEN }}'
         command: "squash and merge"
         approve: true
         target: minor

From 84fe16d274c40ff91da97ea8018c301d00d9179a Mon Sep 17 00:00:00 2001
From: davdhacs <105243888+davdhacs@users.noreply.github.com>
Date: Thu, 22 Aug 2024 11:23:38 -0600
Subject: [PATCH 2/2] use dependabot metadata to automerge

---
 .github/workflows/auto-merge.yml | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index f57745c..71fdcd1 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -1,19 +1,25 @@
-name: auto-merge
-
-on:
-  pull_request_target:
+# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#enable-auto-merge-on-a-pull-request
+name: Dependabot auto-merge
+on: pull_request
 
 permissions:
+  contents: write
   pull-requests: write
 
 jobs:
-  auto-merge:
+  dependabot:
     runs-on: ubuntu-latest
     if: github.actor == 'dependabot[bot]'
     steps:
-    - uses: ahmadnassri/action-dependabot-auto-merge@v2.6
-      with:
-        github-token: '${{ secrets.GITHUB_TOKEN }}'
-        command: "squash and merge"
-        approve: true
-        target: minor
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v2
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        if: steps.metadata.outputs.update-type == 'version-update:semver-minor'
+        run: gh pr merge --auto --squash "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+