From 8422b5216c1bfbd773e6c1775bb72ebee2ceb205 Mon Sep 17 00:00:00 2001
From: Jeffrey Hung <17494876+Jeffreyhung@users.noreply.github.com>
Date: Tue, 10 Sep 2024 15:38:58 -0700
Subject: [PATCH 1/2] Update auto-merge.yml

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

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 091446c3..7e937667 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -7,6 +7,12 @@ jobs:
     if: github.actor == 'getsentry-bot' && startsWith(github.head_ref, 'craft-')
     runs-on: ubuntu-latest
     steps:
+    - name: Get auth token
+      id: token
+      uses: actions/create-github-app-token@3378cda945da322a8db4b193e19d46352ebe2de5 #v.1.10.4
+      with:
+        app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
+        private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}
     - run: |
         set -x
         GH_TOKEN=$GHA_TOKEN gh pr review --approve --repo "$GITHUB_REPOSITORY" "$PR"
@@ -14,4 +20,4 @@ jobs:
       env:
         PR: ${{ github.event.number }}
         GHA_TOKEN: ${{ github.token }}
-        BOT_TOKEN: ${{ secrets.GH_RELEASE_PAT }}
+        BOT_TOKEN: ${{ steps.token.outputs.token }}

From 57cbd2e2f3a88b9e1af5063588771ebbf370a452 Mon Sep 17 00:00:00 2001
From: Jeffrey Hung <17494876+Jeffreyhung@users.noreply.github.com>
Date: Tue, 10 Dec 2024 16:03:55 -0800
Subject: [PATCH 2/2] update `actions/create-github-app-token` version

---
 .github/workflows/auto-merge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index 7e937667..ee45c337 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
     - name: Get auth token
       id: token
-      uses: actions/create-github-app-token@3378cda945da322a8db4b193e19d46352ebe2de5 #v.1.10.4
+      uses: actions/create-github-app-token@5d869da34e18e7287c1daad50e0b8ea0f506ce69 # v1.11.0
       with:
         app-id: ${{ vars.SENTRY_RELEASE_BOT_CLIENT_ID }}
         private-key: ${{ secrets.SENTRY_RELEASE_BOT_PRIVATE_KEY }}