Trunk Based Development

Transcript

1. Trunk Based Development
2. ..the PROBLEM different streams, same code-base
3. ...the SOLUTION?!
4. ?!
6. ..time for TBD Trunk Based Development (TBD) is where all developers (for a particular deployable unit) commit to one shared branch under source-control. That branch is going to be colloquially known as trunk.
7. Before → Now
8. • Branches are only made for a release • Developers are not allowed to create branches in shared place • Only release engineers commit to release branches • Cherry-pick is allowed • Old release branches should be deleted
11. • Don't break the build! • Double-check functional change! • NEVER --force push to trunk! • Do nice commit messages! • Revert commit when you push something BAD! • Use pre-commit verifications! • Let CI be your friend!
12. What about HUGE changes?
13. Branch by Abstraction (BbA) a pattern for making large-scale changes to your application incrementally on mainline
15. How to do BbA? 1) Create an abstraction over the part of the system that you need to change. 2) Re-factor the rest of the system to use the abstraction layer 3) Create new classes in your new implementation, and have your abstraction layer delegate to the old or the new classes as required. 4) Remove the old implementation 5) Rinse and repeat the previous two steps, shipping your system in the meantime if desired 6) Once the old implementation has been completely replaced, you can remove the abstraction layer if you like
16. Feature Toggles
17. Need more info?
18. Thanks!