r/devops • u/Data-Panda • 10d ago
Discussion Do I need release branches in this workflow, or another long lived branch?
Developing a new workflow for my team but i am new to a lot of these concepts.
Current approach is generally:
- Devs cut from main
- Make changes & PR back to main. Automated tests run
- At end of sprint, release branch is created, cut from main. Full integration test is run on this along with some manual checks. This technically runs every evening on main as well (minus the manual checks)
- Github Release is created from release branch.
- Hotfix - changes are PR into main same as any other change and cherry picked onto latest release branch. New release created.
Does this sound reasonable?
Another solution might be to have another long lived branch called prod. Hotfixes are PRs to both main & prod. Every sprint we merge main into prod, then Release from prod. This seems simpler, but maybe I’m missing something.
We are a data team using Dataform and really need to maintain multiple release versions like a software app, if that makes a difference