From 5eee9e57538748effe3ce86fc198a09420b03068 Mon Sep 17 00:00:00 2001
From: Vaica <94612053+zqlit@users.noreply.github.com>
Date: Wed, 3 Jun 2026 14:13:16 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20=E4=BF=AE=E5=A4=8DGitHub=20Actions?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=92=8Crebase=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml       | 4 ++++
 .github/workflows/subset-fonts.yml | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 65ab3400..d4e38e4b 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -92,7 +92,11 @@ jobs:
       continue-on-error: true
       run: |
         git fetch origin main
+        # stash任何未提交的更改，避免rebase失败
+        git stash push -m "temp stash for rebase"
         git rebase origin/main
+        # 恢复stash的更改
+        git stash pop || true
         if ! git log --oneline -1 | grep -q "\[skip ci\]"; then
           echo "No auto-commits to push"
         else
diff --git a/.github/workflows/subset-fonts.yml b/.github/workflows/subset-fonts.yml
index 4872d3c0..65f3fcfb 100644
--- a/.github/workflows/subset-fonts.yml
+++ b/.github/workflows/subset-fonts.yml
@@ -35,6 +35,8 @@ jobs:
     name: Subset Fonts
     runs-on: ubuntu-latest
     timeout-minutes: 30
+    permissions:
+      contents: write  # 添加写权限
 
     # 只在主仓库上运行（fork不运行）
     if: github.repository == 'zqlit/blog'