On this page
Git Conventions
General
- All PRs are merged to main branch in each repository.
- PRs are merged not squashed.
- Rebase.
- Branch name should contain ticket id for example: core-123 / app1-343.
Main Commits
- Vega repo:
- Template:
git commit -m "<go/remix etc>: <service name>: short description" - Message for Example:
go: automations: pass missing timestamp to pqlToSql request
- Template:
- Trino repo:
- Template:
git commit -m "<connector,plugin/common etc>: short description" - Message for Example:
googlesecops: support ilike predicate
- Template:
Fixes Commit
All other commits should be squashed to one of the main commits.
git commit --fixup <specific main commit hash>- Example:
git commit --fixup d2a656073297acb6f8d5199cf339afef23c4072a
- Example:
git rebase --interactive --autosquash origin/<main branch>- This will open vim or IDE editor to allow you to approve what is going to be pushed and what should be changed before.
Deployment Process
- Once all PR’s checks pass, it can be merged to main branch
- Staging deployments occure every ~0.5 an hour and tag
prod-readyall commits in a successful deploy - Prod deployments occure every hour for all commits with
prod-readytag