Use git reset --hard in deploy to handle working tree drift
Deploy to Dev / Deploy & Smoke Test (push) Successful in 32s

git pull fails if untracked files would be overwritten. Switching to
git fetch + reset --hard keeps the dev LXC in sync unconditionally.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-07-07 22:55:03 -06:00
parent d7810d0258
commit f5a2b1ab4f
+2 -1
View File
@@ -31,7 +31,8 @@ jobs:
${{ secrets.DEV_USER }}@${{ secrets.DEV_HOST }} \ ${{ secrets.DEV_USER }}@${{ secrets.DEV_HOST }} \
'set -e 'set -e
cd /opt/lisilou-portfolio cd /opt/lisilou-portfolio
git pull origin main git fetch origin
git reset --hard origin/main
docker compose build docker compose build
docker compose up -d docker compose up -d
echo "Deploy complete"' echo "Deploy complete"'