Fix native deploy to force-reset dirty server trees before checkout.
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
parent
96fa96c61e
commit
5280c5f62a
@ -54,14 +54,16 @@ MARKER="__MARKER__"
|
|||||||
cd "$REMOTE"
|
cd "$REMOTE"
|
||||||
git remote set-url origin "$GIT"
|
git remote set-url origin "$GIT"
|
||||||
git fetch --depth=80 origin dev1
|
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 \
|
git clean -fd \
|
||||||
-e deploy/nomadro-api.env \
|
-e deploy/nomadro-api.env \
|
||||||
-e backend/app/data/user_store.json \
|
-e backend/app/data/user_store.json \
|
||||||
-e backend/app/data/social_store.json \
|
-e backend/app/data/social_store.json \
|
||||||
-e backend/app/data/community_store.json \
|
-e backend/app/data/community_store.json \
|
||||||
|
-e backend/app/data/platform_store.json \
|
||||||
-e .last_deploy_sha
|
-e .last_deploy_sha
|
||||||
git checkout -B dev1 origin/dev1
|
|
||||||
git reset --hard origin/dev1
|
|
||||||
|
|
||||||
# Install / refresh systemd units
|
# Install / refresh systemd units
|
||||||
install -m 644 "$REMOTE/deploy/systemd/nomadro-web.service" /etc/systemd/system/nomadro-web.service
|
install -m 644 "$REMOTE/deploy/systemd/nomadro-web.service" /etc/systemd/system/nomadro-web.service
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user