reset bun.lock before pulling to prevent merge conflicts during deploy

This commit is contained in:
Chris Wanstrath 2026-02-19 19:39:14 -08:00
parent b0323c3655
commit f26b382fa6

View File

@ -14,7 +14,7 @@ git push origin main
ssh "$HOST" DEST="$DEST" APPS_DIR="$APPS_DIR" bash <<'SCRIPT' ssh "$HOST" DEST="$DEST" APPS_DIR="$APPS_DIR" bash <<'SCRIPT'
set -e set -e
cd "$DEST" && git pull origin main && bun install && bun run build cd "$DEST" && git checkout -- bun.lock && git pull origin main && bun install && bun run build
echo "=> Syncing default apps..." echo "=> Syncing default apps..."
for app_dir in "$DEST"/apps/*/; do for app_dir in "$DEST"/apps/*/; do