Skip to content

feat(deploy): #vacation-deploy agent merges branch into main, then deploys prod#10

Draft
ether314 wants to merge 1 commit into
mainfrom
cursor/vacation-deploy-merge-flow-c593
Draft

feat(deploy): #vacation-deploy agent merges branch into main, then deploys prod#10
ether314 wants to merge 1 commit into
mainfrom
cursor/vacation-deploy-merge-flow-c593

Conversation

@ether314

Copy link
Copy Markdown
Owner

Summary

Modifies the #vacation-deploy agent flow so it performs a single two-step operation: merge the feature branch into main, then deploy main to the Firebase prod project (vacation-app-21706). Previously the deploy agent only deployed an already-merged commit (and was blocked on Firebase auth).

  • Adds scripts/merge-and-deploy.sh — the canonical entrypoint: fetch → checkout/ff main → merge branch (or PR head) → push main → deploy (hosting by default, functions optional).
  • Supports scripts/merge-and-deploy.sh <branch> or <pr-number> (resolves PR head via gh), plus DEPLOY_TARGETS, FIREBASE_PROJECT, MAIN_BRANCH, and DRY_RUN env knobs.
  • Documents the flow in docs/deploy.md.

Auth uses the already-provisioned FIREBASE_TOKEN Cloud Agent secret. On a merge conflict the script stops before pushing/deploying.

Testing

Validated every stage that can be exercised without mutating main or production. I deliberately stopped short of a live git push origin main + prod deploy, since those are irreversible production actions — the flow is ready to run via #vacation-deploy (or scripts/merge-and-deploy.sh) on your go-ahead.

  • bash -n scripts/merge-and-deploy.sh — syntax valid
  • gh pr view 9 --json headRefName — PR-number → branch resolution works
  • DRY_RUN=1 scripts/merge-and-deploy.sh <branch> in an isolated clone — clean merge commit, push/deploy correctly skipped
  • firebase projects:list --token $FIREBASE_TOKEN — authenticates to vacation-app-21706
  • flutter build web -t lib/main_customer.dart --release — prod build compiles (the deploy step's build)
Open in Web Open in Cursor 

The deploy agent now merges the feature branch into main, pushes main,
then deploys main to the Firebase prod project (vacation-app-21706).
Adds scripts/merge-and-deploy.sh (with DRY_RUN + PR-number support) and
documents the flow in docs/deploy.md.

Co-authored-by: Joe M <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants