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 .`