From e407e1b98709700b5b446a333746c603f1bad082 Mon Sep 17 00:00:00 2001
From: John Andersen <john.s.andersen@intel.com>
Date: Mon, 24 Jun 2024 11:16:56 -0700
Subject: [PATCH] ci: 00 PR Auto approve: auto approve dependabot

---
 .github/workflows/00_pr_auto_approve.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/00_pr_auto_approve.yml b/.github/workflows/00_pr_auto_approve.yml
index 8f4dec4a7a..68d3ec2096 100644
--- a/.github/workflows/00_pr_auto_approve.yml
+++ b/.github/workflows/00_pr_auto_approve.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       pull-requests: write
-    if: contains(fromJson('["dependabot[bot]", "github-actions[bot]", "pdxjohnny"]'), github.actor)
+    if: contains(fromJson('["app/dependabot", "app/github-actions", "pdxjohnny"]'), github.actor)
     steps:
       - name: Harden Runner
         uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1
@@ -20,3 +20,11 @@ jobs:
       - uses: hmarr/auto-approve-action@8f929096a962e83ccdfa8afcf855f39f12d4dac7 # v4
         with:
           review-message: "LGTM"
+
+      - if: contains(fromJson('["app/dependabot", "app/github-actions"]'), github.actor)
+        env:
+          GH_TOKEN: ${{ github.token }}
+          PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
+        run: |
+          set -x
+          gh pr merge --rebase "${PULL_REQUEST_NUMBER}"