Skip to Content
ConventionsGit Workflow

Git Workflow

Branching, deployment, and release conventions across Housr repos.

Branching Strategy

All repos follow a feature branch workflow:

  1. main is the primary branch — always deployable
  2. Create a feature branch off main for each piece of work
  3. Open a pull request for code review
  4. Merge to main after approval
  5. Delete the feature branch after merge

Branch naming: use descriptive names like feature/bills-checkout, fix/search-pagination, chore/upgrade-deps.

Pull Requests

  • PRs are required for all merges to main
  • At least one review required before merge
  • Keep PRs focused — one feature or fix per PR
  • Write a clear description of what changed and why

Deployment by Repo

Housr-Webapp (Next.js)

  • Hosting: Vercel
  • Preview deployments: Automatic on every PR
  • Production: Auto-deploys on merge to main
  • No manual steps required

Housr-App (Expo)

  • Staging builds: Push a v*.*.* git tag to trigger automated GitHub Actions builds for both UK and US
  • Production builds: Manual dispatch via GitHub Actions (“Deploy Production to TestFlight”)
  • OTA updates (staging): Auto-publish on push to main
  • OTA updates (production): Manual dispatch via GitHub Actions
  • EAS profiles: development, development-simulator, preview, uk-staging, us-staging, uk-production, us-production, demo

Housr-API / API v2 / Portal (Laravel)

  • Docker-based deployments
  • AWS hosting
  • Deployment triggered via CI/CD pipeline on merge to main

Release Versioning

App Releases

The App uses semantic versioning for builds:

# Trigger staging builds for both UK and US git tag v1.2.3 git push origin v1.2.3

Build number is set via APP_VERSION and BUILD_NUMBER environment variables in EAS.

Other Repos

Webapp, API, and Portal do not use explicit version tags — they deploy continuously on merge to main.

Hotfix Process

For urgent production fixes:

  1. Branch off main
  2. Fix the issue
  3. Open a PR with hotfix label
  4. Get expedited review
  5. Merge and deploy immediately
Last updated on