From f5c8d06fbec0660301efbddad963fc2148687412 Mon Sep 17 00:00:00 2001
From: gouki <gouki.xiao@gmail.com>
Date: Sun, 9 Aug 2026 20:24:09 +0000
Subject: [PATCH] =?UTF-8?q?fix(ci):=20=E4=BF=AE=E5=A4=8D=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=A2=AB=20GITEA=5FENV=20=E6=AE=8B=E7=95=99?=
 =?UTF-8?q?=E5=80=BC=E6=B1=A1=E6=9F=93=EF=BC=88=E6=9E=84=E5=BB=BA=201.1.48?=
 =?UTF-8?q?=20=E5=8D=B4=E5=8F=91=E5=B8=83=201.0.48=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Build 步骤不再向 GITEA_ENV 导出 SERVER_VERSION（跨步骤持久化会残留旧值）
- Publish 步骤显式 unset SERVER_VERSION 并自行计算版本号
---
 .gitea/workflows/server-deploy.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/server-deploy.yml b/.gitea/workflows/server-deploy.yml
index 5a914a3..173597e 100644
--- a/.gitea/workflows/server-deploy.yml
+++ b/.gitea/workflows/server-deploy.yml
@@ -98,7 +98,7 @@ jobs:
           APP_COMMIT_SHA=$COMMIT_SHORT
           EOF
           cat bin/version.env
-          echo "SERVER_VERSION=$VERSION" >> "$GITEA_ENV"
+          # 注意：不写入 GITEA_ENV，避免跨步骤/跨运行残留值干扰发布步骤
 
       - name: Create deployment package
         working-directory: server
@@ -121,7 +121,10 @@ jobs:
           LUNAR_PUBLISH_TOKEN: ${{ secrets.LUNAR_PUBLISH_TOKEN }}
         run: |
           set -e
-          VERSION="1.0.${GITEA_RUN_NUMBER}"
+          # 自行计算版本号；绝不复用环境中的 SERVER_VERSION（GITEA_ENV 会跨步骤持久化，
+          # 可能残留早期运行的旧值，曾导致构建 1.1.48 却发布成 1.0.48）
+          unset SERVER_VERSION
+          VERSION="1.1.${GITEA_RUN_NUMBER}"
           TAG="server-v${VERSION}"
           API="https://gitea.neatcn.com/api/v1/repos/gouki/lunar-mini"
           # 优先用仓库 Secret 令牌（GITEA_TOKEN 内建令牌在部分 runner 版本不注入）