chore(make): deploy branch-guard becomes a warning (freshness check kept)#837
Merged
Conversation
`make deploy` / `deploy-frontend` / `analytics-rebuild-forwarder` rsync the local working tree to test-dev, so deploying from a feature branch is a legitimate, common thing to want. The 2026-06-08 incident's harm was that a stale-branch deploy reverted test-dev *silently* — so the fix is to be loud, not to block: print exactly which branch's working tree is being shipped, then proceed. The freshness half of _ff-guard is unchanged — it still fetches origin, auto-fast-forwards when clean, and aborts on a behind-and-diverged tree. ALLOW_BRANCH_DEPLOY=1 still silences the warning. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
make deploy(anddeploy-frontend/analytics-rebuild-forwarder) no longer block when you're not ondev. The branch check becomes a loud, non-blocking warning showing which branch's working tree is being deployed; the command then proceeds.Why
These targets rsync the local working tree to test-dev (:21000), so deploying a feature branch to your iteration box is legitimate and common. The 2026-06-08 incident that motivated the guard was about a stale-branch deploy reverting test-dev silently — the fix is to surface it loudly, not to forbid it.
Kept intact
The freshness check is unchanged:
_ff-guardstillgit fetches origin, auto-fast-forwards a clean branch that's behind its upstream, and aborts only when the tree is behind-and-diverged or dirty-and-behind.ALLOW_BRANCH_DEPLOY=1still silences the warning entirely.Verified the guard returns exit 0 on a feature branch and the Makefile parses.
🤖 Generated with Claude Code