From e0e8aa2cb82f3580be97b5000e8415229ddf624c Mon Sep 17 00:00:00 2001 From: leiyun Date: Tue, 4 Aug 2026 17:31:46 +0800 Subject: [PATCH] fix: force sync pc deploy script --- pnpm-workspace.yaml | 6 +++--- restart.sh | 22 +++++++++------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index f279a81..4e768fe 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,3 +1,3 @@ -allowBuilds: - esbuild: set this to true or false - vue-demi: set this to true or false +onlyBuiltDependencies: + - esbuild + - vue-demi diff --git a/restart.sh b/restart.sh index 4c70d7d..ae0709a 100644 --- a/restart.sh +++ b/restart.sh @@ -56,14 +56,6 @@ validate_tls_security() { fi } -ensure_clean_worktree() { - if [ -n "$(git status --porcelain)" ]; then - log "Working tree is not clean. Commit/stash/clean changes before deploy." - git status --short - exit 1 - fi -} - resolve_branch() { if [ -z "$BRANCH" ]; then BRANCH="$(git rev-parse --abbrev-ref HEAD)" @@ -74,11 +66,15 @@ resolve_branch() { fi } -pull_latest_code() { - log "Pull latest code from origin/$BRANCH" - ensure_clean_worktree +sync_latest_code() { + log "Force sync code from origin/$BRANCH" git fetch origin "$BRANCH" - git pull --ff-only origin "$BRANCH" + if [ -n "$(git status --porcelain)" ]; then + log "Discard local working tree changes before deploy" + git status --short + fi + git reset --hard "origin/$BRANCH" + git clean -fd } install_dependencies() { @@ -118,7 +114,7 @@ main() { log "pm2: $(pm2 -v)" log "API: $NUXT_PUBLIC_API_BASE" - pull_latest_code + sync_latest_code install_dependencies build_app restart_app