From be03204a735a309f662f8faea76352a150138eab Mon Sep 17 00:00:00 2001
From: gewuyou <gewuyou1024@gmail.com>
Date: Wed, 13 Aug 2025 20:10:12 +0800
Subject: [PATCH] =?UTF-8?q?ci:=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E6=89=93=E6=A0=87=E7=AD=BE=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新 Alpine 镜像为带有 Git 的版本
-重新组织脚本步骤，提高流程清晰度
- 添加删除本地 tag 和拉取远程 tag 及 main 分支的步骤
- 优化变量获取方式，确保获取到正确的 main commit
---
 .gitlab/workflows/.gitlab-ci.main.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitlab/workflows/.gitlab-ci.main.yml b/.gitlab/workflows/.gitlab-ci.main.yml
index eec9f8f..3adbd26 100644
--- a/.gitlab/workflows/.gitlab-ci.main.yml
+++ b/.gitlab/workflows/.gitlab-ci.main.yml
@@ -13,14 +13,21 @@ before_script:
 # 🏷️ 自动打标签
 tag:
   stage: tag
-  image: alpine:latest
+  image:
+    name: alpine/git:latest
+    entrypoint: [ "" ]
   rules:
     - if: '$CI_COMMIT_BRANCH == "main" && $CI_COMMIT_MESSAGE !~ /ci/i'
   script:
-    - set -euo pipefail
-    - apk add --no-cache git
     - git config --global user.email "pipeline@${GITLAB_URL}"
     - git config --global user.name "Project Pipeline Bot"
+    - echo "🧹 删除所有本地 tag..."
+    - git tag -l | xargs -r git tag -d || true
+    - echo "🔍 拉取远程 tag 和 main"
+    - git fetch --tags --force --prune
+    - git fetch origin main --force
+    - MAIN_COMMIT=$(git rev-parse origin/main)
+    - echo "🔗 当前 main commit -> $MAIN_COMMIT"
     - git fetch --tags
     - git fetch origin main
     - MAIN_COMMIT=$(git rev-parse origin/main)