Continuous integration is a critical part of working as a team and shipping great software. But when you switch to Git, CI can seem chaotic due to the sudden explosion of branches. Learn how to keep it under control with branch builds, shallow clones, repository caching, and other tricks of the trade.

1. #atlassian

2. Super-powered CI with Git
SARAH GOFF-DUPONT • DEV TOOLS MARKETING • ATLASSIAN • @DEVTOOLSUPERFAN

3. Agenda
WHY GIT?
CI-FRIENDLY REPOS
CI ON FEATURE BRANCHES
FREE STUFF

4. Why Git?
WHY GIT?
CI-FRIENDLY REPOS
CI ON FEATURE BRANCHES
GIT HOOKS FOR CI

5. In Git
branching &
merging is a breeze

7. 775 branches in the JIRA code base

8. Simplest Workflow
keep master green
master
feature/DEV-30
feature/DEV-45
experiment on your feature branch

9. CI-friendly Repos
WHY GIT?
CI-FRIENDLY REPOS
CI ON FEATURE BRANCHES
GIT HOOKS FOR CI

10. Avoid tracking
large files in your
repo.

11. Just archive it

12. Shallow clones for the win

13. Photo: returndates.com
Cache the repo on agents

14. Built into

15. CI on Feature Branches
WHY GIT?
CI-FRIENDLY REPOS
CI ON FEATURE BRANCHES
GIT HOOKS FOR CI

16. Simplest Workflow
master
feature/DEV-30
feature/DEV-45

17. Photo: Andres Galdamez
Auto-detect new branches

18. Built into

19. automatically
manually
Branch Build Triggers
v 1.2
master
feature/DEV-30

20. But it’s not pure CI!

21. master
sgd/DEV-30
Rebase before merging

22. how my changes will behave
after merging to master
master
sgd/DEV-30
Rebase before merging

23. Auto-merge feature branches

24. Shallow clones for the win

25. Photo: returndates.com
Cache the repo on agents

26. Auto-merge feature branches

27. Built into

28. Integration Workflow
master
integration
feature/DEV-45
back to the drawing board…

29. Key takeaways:
• Let feature branches do the dirty work
• Say “yes” to shallow clones and repo caching
• All your branch are belong to CI
• Git hooks = ninja powers
#atlassian

30. Key takeaways:
• Let feature branches do the dirty work
• Say “yes” to shallow clones and repo caching
• All your branch are belong to CI
• Git hooks = ninja powers
#atlassian


31. Key takeaways:
• Let feature branches do the dirty work
• Say “yes” to shallow clones and repo caching
• All your branch are belong to CI
• Git hooks = ninja powers
#atlassian
!

32. Key takeaways:
• Let feature branches do the dirty work
• Say “yes” to shallow clones and repo caching
• All your branch are belong to CI
• Git hooks = ninja powers
#atlassian

33. Key takeaways:
• Let feature branches do the dirty work
• Say “yes” to shallow clones and repo caching
• All your branch are belong to CI
• Git hooks = ninja powers
#atlassian

34. Free stuff!
•SourceTree
•atlassian.com/git

35. Thank you!
SARAH GOFF-DUPONT • DEV TOOLS MARKETING • ATLASSIAN • @DEVTOOLSUPERFAN