From d08438134e19904723f1d25235c92d5119a92089 Mon Sep 17 00:00:00 2001
From: Tomasz Janiszewski <tjanisze@redhat.com>
Date: Mon, 17 Nov 2025 13:00:07 +0100
Subject: [PATCH] Update auto-merge workflow for Dependabot PRs

Based on: https://github.com/stackrox/junit2jira/blob/c46b65b90ebdf07abe782e1ac42f41c594c5a8ad/.github/workflows/auto-merge.yml

Dependabot no longer supports `squash and merge` command https://github.blog/changelog/2025-10-07-upcoming-changes-to-github-dependabot-pull-request-comment-commands/

- https://github.com/stackrox/jenkins-plugin/pull/470
---
 .github/workflows/auto-merge.yml | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 2b9c9a2..c450ca1 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -1,16 +1,17 @@
-name: auto-merge
+name: Dependabot auto-merge
+on: pull_request
 
-on:
-  pull_request_target:
+permissions:
+  contents: write
+  pull-requests: write
 
 jobs:
-  auto-merge:
+  dependabot:
     runs-on: ubuntu-latest
-    if: github.actor == 'dependabot[bot]'
+    if: github.event.pull_request.user.login == 'dependabot[bot]'
     steps:
-    - uses: ahmadnassri/action-dependabot-auto-merge@v2.6
-      with:
-        github-token: '${{ secrets.RHACS_BOT_GITHUB_TOKEN }}'
-        command: "squash and merge"
-        approve: true
-        target: minor
+      - name: Enable auto-merge for Dependabot PRs
+        run: gh pr merge --auto --squash "$PR_URL" && gh pr review --approve "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}