Skip to content

fix: preserve deployment backups during source sync #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HansonL622 merged 1 commit into from
Aug 27, 2026
Merged

fix: preserve deployment backups during source sync #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deploy/scripts/sync-build-deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ fi
log "同步源码：$current_sha -> $target_sha"
git -C "$BASE_DIR" reset --hard "$target_sha"
# Keep server-owned runtime files while removing unexpected untracked files.
git -C "$BASE_DIR" clean -fd -e deploy/env/ -e runtime-logs/ -e .source-deploy-state
unexpected="$(git -C "$BASE_DIR" status --porcelain --untracked-files=all | grep -v '^?? deploy/env/' | grep -v '^?? runtime-logs/' || true)"
git -C "$BASE_DIR" clean -fd -e deploy/env/ -e backups/ -e runtime-logs/ -e .source-deploy-state
unexpected="$(git -C "$BASE_DIR" status --porcelain --untracked-files=all | grep -v '^?? deploy/env/' | grep -v '^?? backups/' | grep -v '^?? runtime-logs/' || true)"
[[ -z "$unexpected" ]] || fail "同步后工作区仍有未预期改动：$unexpected"

monitoring_network="$(sed -n 's/^MONITORING_NETWORK_NAME=//p' "$ENV_FILE" | head -n 1 | tr -d "'\"")"
Expand Down
8 changes: 4 additions & 4 deletions docs/deployment-source.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@ test "$(stat -c '%a' /opt/unispeaking/deploy/env/.env)" = 600

## 同步工作区

以下操作会让跟踪文件严格匹配远程 `main`，并删除工作区内未跟踪的临时文件；服务器私有 `.env` 和 `runtime-logs/` 会保留：
以下操作会让跟踪文件严格匹配远程 `main`，并删除工作区内未跟踪的临时文件；服务器私有 `.env`、`backups/` 和 `runtime-logs/` 会保留：

```bash
cd /opt/unispeaking
git remote set-url origin https://github.com/1024XEngineer/UniSpeaking.git
git fetch --prune origin main
git reset --hard origin/main
git clean -fd -e deploy/env/ -e runtime-logs/ -e .source-deploy-state
git clean -fd -e deploy/env/ -e backups/ -e runtime-logs/ -e .source-deploy-state
git status --short
```

`git status --short` 只能显示服务器保留的 `deploy/env/` 或 `runtime-logs/` 内容；若出现其他修改，应停止并人工确认。
`git status --short` 只能显示服务器保留的 `deploy/env/`、`backups/` 或 `runtime-logs/` 内容；若出现其他修改，应停止并人工确认。

## 安装定时部署

Expand Down Expand Up @@ -142,7 +142,7 @@ git log --oneline -10

```bash
git reset --hard <GOOD_SHA>
git clean -fd -e deploy/env/ -e runtime-logs/ -e .source-deploy-state
git clean -fd -e deploy/env/ -e backups/ -e runtime-logs/ -e .source-deploy-state
systemctl start unispeaking-source-deploy.service
journalctl -u unispeaking-source-deploy.service -n 200 --no-pager
```
Expand Down
Loading