From 7e23ddc155c598ba8a18ca8c28d08462ac644468 Mon Sep 17 00:00:00 2001
From: Christins <chen.christins@icloud.com>
Date: Mon, 26 Oct 2026 20:23:12 +0800
Subject: [PATCH] =?UTF-8?q?fix(ci):=20=E6=81=A2=E5=A4=8D=20Release=20?=
 =?UTF-8?q?=E5=86=99=E5=85=A5=E6=9D=83=E9=99=90=E5=B9=B6=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E9=A2=84=E5=8F=91=E5=B8=83=20tag=20=E7=9A=84=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy.yml | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 14d551b..d73bc5e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -5,6 +5,11 @@ on:
     tags: ["v*"]
   workflow_dispatch:
 
+# 创建 GitHub Release 需要写权限；缺少此声明时 GITHUB_TOKEN 为只读，
+# softprops/action-gh-release 会返回 403 Resource not accessible by integration。
+permissions:
+  contents: write
+
 # 同一套线上目录只能同时执行一个发布，避免两个任务互相清理 release。
 concurrency:
   group: techhaven-production-deploy
@@ -150,9 +155,17 @@ jobs:
         id: changelog
         run: |
           TAG="${{ github.ref_name }}"
-          awk -v tag="$TAG" 'BEGIN{f=0} /^## /{if(f)exit} $0 ~ ("^## +\\[" tag "\\]"){f=1;next} f{print}' CHANGELOG.md > release_notes.md
+          # 预发布 tag（如 v1.2.1-rc1）回退到对应的正式版本段落
+          BASE_TAG="${TAG%%-*}"
+          extract() {
+            awk -v tag="$1" 'BEGIN{f=0} /^## /{if(f)exit} $0 ~ ("^## +\\[" tag "\\]"){f=1;next} f{print}' CHANGELOG.md > release_notes.md
+          }
+          extract "$TAG"
+          if [ ! -s release_notes.md ] && [ "$BASE_TAG" != "$TAG" ]; then
+            extract "$BASE_TAG"
+          fi
           if [ ! -s release_notes.md ]; then
-            echo "见 CHANGELOG.md" > release_notes.md
+            echo "Release ${TAG}" > release_notes.md
           fi
 
       - name: Create GitHub Release
@@ -162,3 +175,5 @@ jobs:
           tag_name: ${{ github.ref_name }}
           name: ${{ github.ref_name }}
           body_path: release_notes.md
+          # 预发布 tag（含 -rc/-beta 等）标记为 prerelease，避免被当成 Latest
+          prerelease: ${{ contains(github.ref_name, '-') }}