diff --git a/deploy/deploy.sh b/deploy/deploy.sh index 158aa0f..50aaf96 100755 --- a/deploy/deploy.sh +++ b/deploy/deploy.sh @@ -29,6 +29,9 @@ echo "== deploy $TAG -> $HOST (service $SERVICE, config $CONFIG) ==" # Code push: tag tree over ~/fjerkroa_bot; untracked config/state survives (DEP-01) git archive "$TAG" | ssh "$HOST" 'mkdir -p ~/fjerkroa_bot && tar -x -C ~/fjerkroa_bot' +# In-place extraction does not delete files removed from the tree — +# clear known legacy packaging leftovers (they break the pip build) +ssh "$HOST" 'rm -f ~/fjerkroa_bot/setup.py ~/fjerkroa_bot/requirements.txt ~/fjerkroa_bot/pytest.ini' ssh "$HOST" "set -e [ -x ~/venv-bot/bin/python ] || python3.11 -m venv ~/venv-bot diff --git a/manual-verification.md b/manual-verification.md index bca9db0..fbf2866 100644 --- a/manual-verification.md +++ b/manual-verification.md @@ -8,7 +8,7 @@ with date + result. | --- | --- | --- | | DEP-01 | 2026-07-13 | Verified with the v3.0.0 ggg deploy: tag-only refusal + untracked config/state survived. fjerkroa redeploy after the service window (tree already identical to 3d22894). | | DEP-02 | 2026-07-13 | Service map exercised: luma restart via script (v3.0.0); kroa mapping code-reviewed, exercised on its next deploy. | -| DEP-03 | 2026-07-13 | bot.db.pre-v3.0.0 backup confirmed on ggg after deploy. | +| DEP-03 | 2026-07-13 | ggg had no pre-existing bot.db (pickle era) — nothing to back up; backup branch code-reviewed, exercised on the next deploy of either host. | | DEP-04 | 2026-07-13 | Smoke gate exercised on ggg: RUNNING + fresh login line. | | DEP-05 | 2026-07-13 | Live-verified: kroa deploy attempt ~15h Oslo refused without DEPLOY_FORCE=1. | | DEP-06 | 2026-07-13 | Rollback documented (older tag + db backup restore); live drill pending — next release. |