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

▶

Sep 15, 2023 247 likes •614 views

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

SLIDE 1

SLIDE 2

Git Branching for Continuous Delivery

extreme ^

SLIDE 3

@DevToolSuperFan

Sarah Goff-Dupont

Developer Advocate & Agile Delivery Nerd

not afraid to ham it up in photos

SLIDE 4

Agenda

Git + CD = BFFs Branching models Pointers & pro-tips

1 2 3

SLIDE 5

Why Git for CD?

SLIDE 6

Challenge #1: dependencies

easy to navigate, right?

SLIDE 7

look Ma, a goat! I do my thing, too I do my thing

Challenge #2: code line chaos

SLIDE 8

Build in narrow vertical slices

DATABASE BACK END FRONT END TESTING

Time “big bang” launch

DATABASE BACK END FRONT END TESTING

pint-sized release

SLIDE 9

Branching & merging is a breeze In Git

SLIDE 10

Keep the main line clean

dev branch = isolation chamber

SLIDE 11

Clarity & traceability

SLIDE 12

Branch-per-Issue Workflow

SLIDE 13

sgd-IRKD-30 sgd-IRKD-45 master

A branch for every issue

fortunately, no goats here

SLIDE 14

A branch for every issue

master sgd-IRKD-30 gatekeeper

SLIDE 15

A branch for every issue

still no goats!

SLIDE 16

sgd-IRKD-30 sgd-IRKD-45 master

Surprise!

SLIDE 17

sgd-IRKD-30 sgd-IRKD-45 master

Using an integration branch

integration

SLIDE 18

sgd-IRKD-30 sgd-IRKD-45 master

Using an integration branch

integration

SLIDE 19

Branch-per-Issue Workflow

for installed app teams

SLIDE 20

sgd-IRKD-30 master

Multiple-version support

v 1.2 v 1.1

SLIDE 21

sgd-IRKD-30 master

Pre-release changes

v 1.2 v 1.1 sgd-IRKD-31

SLIDE 22

sgd-IRKD-30 master

Post-release updates

v 1.2 v 1.1 bugfix- IRKD-32

SLIDE 23

master

Post-release updates

v 1.2 v 1.1 bugfix-IRKD-32

SLIDE 24

Other “Stuff” to Consider

SLIDE 25

Running CI on dev branches

all active branches are under test

SLIDE 26

1 2 3

Running CI on dev branches

Manually clone master’s CI configs Automate with plugin or Git hook

bitbucket.org/tpettersen/git-ci-hooks

SLIDE 27

Running CI on dev branches

SLIDE 28

Using build power efficiently

sgd-IRKD-30 master v 1.2 trigger CI with every commit here push-button builds here

SLIDE 29

Peer code review

SLIDE 30

Peer code review

1 2 3

Create request via UI or git request-pull Review, revise, rinse & repeat Approve & merge

SLIDE 31

Take it to the extreme

Let dev branches do the dirty work

1 2 3

Keep master releasable at all times Reach continuous delivery nirvana

Build small pieces, end-to-end

SLIDE 32

More info at...

1 2

http://atlassian.com/git @Atlassian

SLIDE 33

Q & A

SLIDE 34

SLIDE 35

@DevToolSuperFan

Sarah Goff-Dupont

Developer Advocate & Agile Delivery Nerd sgoffdupont@atlassian.com

SLIDE 36