Branching and workflow model

[timgentry]

Context and Problem Statement

We want an off-the-shelf branching and workflow model that is familiar to contributors, so that we can use existing code or SaaS tooling (like Spacelift, Terraform Cloud, Snyk, GitHub Actions, etc), rather than writing our own - we want to be focussed on novel innovative stuff. We want to automate as much of the CI/CD process as possible.

Which should we choose?

My initial suggestion is GitHub flow.

[timgentry]

We should consider providing the terraform code to help set up branch protection etc (see https://registry.terraform.io/providers/integrations/github/latest/docs)

[timgentry]

Other models are:

• Gitflow
• Trunk-based development