From 06b67d451991b281be3b87acb9410260f48fd32f Mon Sep 17 00:00:00 2001
From: Mauricio Siu <siumauricio@icloud.com>
Date: Thu, 6 Aug 2026 00:26:52 -0600
Subject: [PATCH] fix(ci): push hotfix cherry-picks with PAT to satisfy branch
 rules

---
 .github/workflows/hotfix-cherry-pick.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/hotfix-cherry-pick.yml b/.github/workflows/hotfix-cherry-pick.yml
index 75acee7fb..9632917d4 100644
--- a/.github/workflows/hotfix-cherry-pick.yml
+++ b/.github/workflows/hotfix-cherry-pick.yml
@@ -20,6 +20,7 @@ jobs:
         with:
           ref: main
           fetch-depth: 0
+          token: ${{ secrets.HOTFIX_PUSH_TOKEN }}
 
       - name: Cherry-pick fix to main
         run: |
@@ -31,4 +32,5 @@ jobs:
           else
             git cherry-pick -x "$SHA"
           fi
+          git commit --amend -m "$(git log -1 --format=%B)" -m "[skip ci]"
           git push origin main