Restructure repo to enable hotfixes and stable release path
Closed this issue · 3 comments
Currently, the repo has a Master and we work with feature branches from Master to add and improve and fix things. When those are done they get merged back to Master. However, that leads to an unstable Master between releases, so if we ever have to do an out-of-band release we're in trouble.
Proposal: Introduce a Development branch from Master. Feature branches will be created from Development and when we're ready for release we'll merge back to Master. Releases will be created and tagged from Master. Hotfixes will be created from Master and merged with Development.
Things to do:
- Create Development branch
- Protect Master branch (https://help.github.com/articles/about-protected-branches/)
- Add CI trigger for Development branch
I suggest we do this when 2.1.0 is released because currently there are already changes (#40) for that release in Master. I'd rather do this with a fully stable Master.
v2.1.0 is released, so we can do this now.
All done. Also set the defautl branch to Development and besides the CI trigger I also enabled pull request validation on Development.