From 5280c5f62a8f00eb12d253270b9cb144f0738aa3 Mon Sep 17 00:00:00 2001 From: eric Date: Sun, 30 Aug 2026 11:35:55 -0500 Subject: [PATCH] Fix native deploy to force-reset dirty server trees before checkout. Co-authored-by: Cursor --- scripts/deploy_update.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/deploy_update.py b/scripts/deploy_update.py index 80a715b..822f2cf 100644 --- a/scripts/deploy_update.py +++ b/scripts/deploy_update.py @@ -54,14 +54,16 @@ MARKER="__MARKER__" cd "$REMOTE" git remote set-url origin "$GIT" git fetch --depth=80 origin dev1 +# Force-align to origin/dev1 even if prior SFTP hotfixes left dirty trees +git checkout -f -B dev1 origin/dev1 +git reset --hard origin/dev1 git clean -fd \ -e deploy/nomadro-api.env \ -e backend/app/data/user_store.json \ -e backend/app/data/social_store.json \ -e backend/app/data/community_store.json \ + -e backend/app/data/platform_store.json \ -e .last_deploy_sha -git checkout -B dev1 origin/dev1 -git reset --hard origin/dev1 # Install / refresh systemd units install -m 644 "$REMOTE/deploy/systemd/nomadro-web.service" /etc/systemd/system/nomadro-web.service