From 41f3fb7fb067c7646c788276fc339d2f91ea1c6a Mon Sep 17 00:00:00 2001 From: Blizzard Date: Fri, 17 Jul 2026 13:43:46 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E8=A7=A6=E5=8F=91=E5=88=86=E6=94=AF?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=20main=EF=BC=88=E6=8F=90=E4=BA=A4=E6=88=96?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=85=A5=20main=20=E6=89=8D=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - deploy.yml 触发条件 dev → main；PR 合并进 main 产生的 push 同样覆盖 - 文档同步：日常开发走 dev，合并 main 才上线 Co-Authored-By: Claude Opus 4.8 --- .gitea/workflows/deploy.yml | 3 ++- deploy/README.md | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 51a6f80..cb76319 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -1,8 +1,9 @@ name: build-and-deploy on: + # 仅 main 有提交（含 PR 合并入 main）时触发 push: - branches: [dev] + branches: [main] workflow_dispatch: env: diff --git a/deploy/README.md b/deploy/README.md index 5909c36..1fc4ec1 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -3,7 +3,7 @@ ## 拓扑 ``` -push dev ──▶ Gitea(192.168.100.125:3000) +push/merge main ─▶ Gitea(192.168.100.125:3000) │ 触发 .gitea/workflows/deploy.yml ▼ act_runner(192.168.100.128) @@ -52,7 +52,8 @@ vi .env # 改 admin 密码、JWT 密钥 ## 日常 -- push 到 `dev` 分支自动构建部署；也可在 Gitea Actions 页手动 `workflow_dispatch` +- 提交或合并到 `main` 分支自动构建部署；也可在 Gitea Actions 页手动 `workflow_dispatch` +- 日常开发在 `dev` 分支，PR 合并进 `main` 才触发上线 - 回滚：132 上 `docker tag` 保留的旧镜像，或重跑上一次成功的 commit - 查日志：`docker logs -f sundynix-site` - 本地手动出包（不走 CI）：仓库根 `docker build -t sundynix-site:latest .`