Use git reset --hard in deploy to handle working tree drift
Deploy to Dev / Deploy & Smoke Test (push) Successful in 32s
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:
@@ -31,7 +31,8 @@ jobs:
|
||||
${{ secrets.DEV_USER }}@${{ secrets.DEV_HOST }} \
|
||||
'set -e
|
||||
cd /opt/lisilou-portfolio
|
||||
git pull origin main
|
||||
git fetch origin
|
||||
git reset --hard origin/main
|
||||
docker compose build
|
||||
docker compose up -d
|
||||
echo "Deploy complete"'
|
||||
|
||||
Reference in New Issue
Block a user