justin/new-site
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

deploy: reset generated site files before pull (fixes silently-stranded commits)

Browse source 
deploy.sh ran sync_nav.py / gen-service-catalog.py which dirty site/public +
site/src in place; that made 'git pull' abort, so recent commits never reached
prod until pulled manually. Reset those generated paths before pulling so deploys
always fast-forward. Also document the IRP POA signer-name/title follow-up.
This commit is contained in:
justin 2026-06-16 05:28:45 -05:00
parent a74516a255
commit 42b433db5a
2 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
deploy.sh
View file

@ -21,6 +21,12 @@ SERVICES="${@:-site api workers proxy-relay listmonk-hc}"
BUILD_SERVICES="$(echo "$SERVICES" | tr ' ' '\n' | grep -vE '^(proxy-relay|listmonk-hc)$' | tr '\n' ' ')"
echo "=== Pulling latest from git ==="
# deploy steps below (sync_nav.py, gen-service-catalog.py) rewrite generated
# files under site/public + site/src in place, leaving the tree dirty. That dirty
# tree makes `git pull` abort ("local changes would be overwritten"), silently
# stranding new commits on an old checkout. Discard those generated changes first
# so the pull always fast-forwards. (Only generated paths are reset.)
git checkout -- site/public site/src 2>/dev/null || true
git pull origin main
# Single source of truth for the site header: rewrite every static page's