From 22cd96a948ec51eda1ebc3eedda43214d9b849dd Mon Sep 17 00:00:00 2001 From: dafe Date: Mon, 2 Nov 2026 15:15:40 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E4=BA=91=E7=AB=AF=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20tag=20=E8=A7=A6=E5=8F=91=EF=BC=88push=20v*?= =?UTF-8?q?=20=E5=8D=B3=E5=AE=A1=E6=A0=B8=E5=8F=91=E5=B8=83=EF=BC=89?= =?UTF-8?q?=EF=BC=8Cclone=20=E5=8A=A8=E6=80=81=20ref?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/deploy-cloud.yml | 16 +++++++++------- .gitea/workflows/deploy-lan.yml | 5 +++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/deploy-cloud.yml b/.gitea/workflows/deploy-cloud.yml index b54a549..84e5705 100644 --- a/.gitea/workflows/deploy-cloud.yml +++ b/.gitea/workflows/deploy-cloud.yml @@ -1,20 +1,22 @@ name: 发布-云端 -# 仅人工触发(Gitea 网页 Actions 页点 Run workflow)= 审核发布 +# 审核 = 人工决定打不打 tag:push v* 标签即发布公网 +# 发布历史 = git tag 列表(git tag -l 'v*'),发布版本号 = tag 名 on: - workflow_dispatch: {} + push: + tags: ['v*'] jobs: deploy: runs-on: build-runner steps: - - name: 拉取代码 + - name: 拉取代码(tag 版本) run: | - git clone --depth 1 "http://dafe:${{ secrets.GITHUB_TOKEN }}@192.168.51.66:3000/dafe/homepage.git" site + git clone --depth 1 --branch "${GITHUB_REF_NAME}" "http://dafe:${{ secrets.GITHUB_TOKEN }}@192.168.51.66:3000/dafe/homepage.git" site - - name: 注入构建版本号(缓存击穿,版本=commit 短 SHA) + - name: 注入发布版本号(缓存击穿,版本=tag 名) run: | cd site - sed -i "s/?v=[0-9]*/?v=${GITHUB_SHA:0:8}/g" index.html + sed -i "s/?v=[0-9]*/?v=${GITHUB_REF_NAME}/g" index.html - name: 发布到 ubuntu3(公网 www.shashann.com) env: @@ -31,4 +33,4 @@ jobs: - name: 上线验证 run: | curl -s -f -o /dev/null --resolve www.shashann.com:443:124.222.157.76 https://www.shashann.com/ || { echo "❌ 公网验证失败"; exit 1; } - echo "✅ 云端已发布 $(date '+%H:%M:%S')" + echo "✅ 云端已发布 ${GITHUB_REF_NAME} $(date '+%H:%M:%S')" diff --git a/.gitea/workflows/deploy-lan.yml b/.gitea/workflows/deploy-lan.yml index 2d655a4..1444866 100644 --- a/.gitea/workflows/deploy-lan.yml +++ b/.gitea/workflows/deploy-lan.yml @@ -1,5 +1,6 @@ name: 部署-局域网 -# push 到 main 即自动上线 51.66(无人工环节) +# 合并/推送到 main 即自动上线 51.66(集成分支 = 内部预发布环境) +# feature 分支的 push 不触发,开发期不影响线上 on: push: branches: [main] @@ -10,7 +11,7 @@ jobs: steps: - name: 拉取代码 run: | - git clone --depth 1 "http://dafe:${{ secrets.GITHUB_TOKEN }}@192.168.51.66:3000/dafe/homepage.git" site + git clone --depth 1 --branch "${GITHUB_REF_NAME}" "http://dafe:${{ secrets.GITHUB_TOKEN }}@192.168.51.66:3000/dafe/homepage.git" site - name: 注入构建版本号(缓存击穿,版本=commit 短 SHA) run: |