Git Branching for Continuous Delivery Sarah Goff-Dupont Developer - PowerPoint PPT Presentation

extreme ^ Git Branching for Continuous Delivery

Sarah Goff-Dupont Developer Advocate & Agile Delivery Nerd @DevToolSuperFan not afraid to ham it up in photos

Agenda Git + CD = BFFs 1 Branching models 2 Pointers & pro-tips 3

Why Git for CD?

Challenge #1: dependencies easy to navigate, right?

Challenge #2: code line chaos I do my thing, too I do my thing look Ma, a goat!

Build in narrow vertical slices “big bang” launch pint-sized release TESTING TESTING FRONT END FRONT END BACK END BACK END DATABASE DATABASE Time

In Git Branching & merging is a breeze

Keep the main line clean dev branch = isolation chamber

Clarity & traceability

Branch-per-Issue Workflow

A branch for every issue fortunately, no goats here master sgd-IRKD-30 sgd-IRKD-45

A branch for every issue master sgd-IRKD-30 gatekeeper

A branch for every issue still no goats!

Surprise! master sgd-IRKD-30 sgd-IRKD-45

Using an integration branch master integration sgd-IRKD-30 sgd-IRKD-45

Using an integration branch master integration sgd-IRKD-30 sgd-IRKD-45

Branch-per-Issue Workflow for installed app teams

Multiple-version support v 1.1 v 1.2 master sgd-IRKD-30

Pre-release changes v 1.1 v 1.2 sgd-IRKD-31 master sgd-IRKD-30

Post-release updates bugfix- v 1.1 IRKD-32 v 1.2 master sgd-IRKD-30

Post-release updates bugfix-IRKD-32 v 1.1 v 1.2 master

Other “Stu ff ” to Consider

Running CI on dev branches all active branches are under test

Running CI on dev branches bitbucket.org/tpettersen/git-ci-hooks Manually clone master’s CI configs 1 Automate with plugin or Git hook 2 3

Running CI on dev branches

Using build power e ff iciently trigger CI with every commit here v 1.2 master sgd-IRKD-30 push-button builds here

Peer code review

Peer code review Create request via UI or git request-pull 1 Review, revise, rinse & repeat 2 Approve & merge 3

Take it to the extreme Build small pieces, end-to-end 1 Let dev branches do the dirty work 2 Keep master releasable at all times 3 Reach continuous delivery nirvana 4

More info at... http://atlassian.com/git 1 @Atlassian 2

Q & A

Sarah Goff-Dupont Developer Advocate & Agile Delivery Nerd @DevToolSuperFan sgo ff dupont@atlassian.com