Successfully reported this slideshow.
We use your LinkedIn profile and activity data to personalize ads and to show you more relevant ads. You can change your ad preferences anytime.
#atlassian
Super-powered CI with Git 
SARAH GOFF-DUPONT • DEV TOOLS MARKETING • ATLASSIAN • @DEVTOOLSUPERFAN
Agenda 
WHY GIT? 
CI-FRIENDLY REPOS 
CI ON FEATURE BRANCHES 
FREE STUFF
Why Git? 
WHY GIT? 
CI-FRIENDLY REPOS 
CI ON FEATURE BRANCHES 
GIT HOOKS FOR CI
In Git 
branching & 
merging is a breeze
775 branches in the JIRA code base
Simplest Workflow 
keep master green 
master 
feature/DEV-30 
feature/DEV-45 
experiment on your feature branch
CI-friendly Repos 
WHY GIT? 
CI-FRIENDLY REPOS 
CI ON FEATURE BRANCHES 
GIT HOOKS FOR CI
Avoid tracking 
large files in your 
repo.
Just archive it
Shallow clones for the win
Photo: returndates.com 
Cache the repo on agents
Built into
CI on Feature Branches 
WHY GIT? 
CI-FRIENDLY REPOS 
CI ON FEATURE BRANCHES 
GIT HOOKS FOR CI
Simplest Workflow 
master 
feature/DEV-30 
feature/DEV-45
Photo: Andres Galdamez 
Auto-detect new branches
Built into
automatically 
manually 
Branch Build Triggers 
v 1.2 
master 
feature/DEV-30
But it’s not pure CI!
master 
sgd/DEV-30 
Rebase before merging
how my changes will behave 
after merging to master 
master 
sgd/DEV-30 
Rebase before merging
Auto-merge feature branches
Shallow clones for the win
Photo: returndates.com 
Cache the repo on agents
Auto-merge feature branches
Built into
Integration Workflow 
master 
integration 
feature/DEV-45 
back to the drawing board…
Key takeaways: 
• Let feature branches do the dirty work 
• Say “yes” to shallow clones and repo caching 
• All your branc...
Key takeaways: 
• Let feature branches do the dirty work 
• Say “yes” to shallow clones and repo caching 
• All your branc...
Key takeaways: 
• Let feature branches do the dirty work 
• Say “yes” to shallow clones and repo caching 
• All your branc...
Key takeaways: 
• Let feature branches do the dirty work 
• Say “yes” to shallow clones and repo caching 
• All your branc...
Key takeaways: 
• Let feature branches do the dirty work 
• Say “yes” to shallow clones and repo caching 
• All your branc...
Free stuff! 
•SourceTree 
•atlassian.com/git
Thank you! 
SARAH GOFF-DUPONT • DEV TOOLS MARKETING • ATLASSIAN • @DEVTOOLSUPERFAN
Super-powered CI with Git - Sarah Goff-Dupont
Upcoming SlideShare
Loading in …5
×

Super-powered CI with Git - Sarah Goff-Dupont

2,856 views

Published on

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.

Published in: Software
  • Be the first to comment

Super-powered CI with Git - Sarah Goff-Dupont

  1. 1. #atlassian
  2. 2. Super-powered CI with Git SARAH GOFF-DUPONT • DEV TOOLS MARKETING • ATLASSIAN • @DEVTOOLSUPERFAN
  3. 3. Agenda WHY GIT? CI-FRIENDLY REPOS CI ON FEATURE BRANCHES FREE STUFF
  4. 4. Why Git? WHY GIT? CI-FRIENDLY REPOS CI ON FEATURE BRANCHES GIT HOOKS FOR CI
  5. 5. In Git branching & merging is a breeze
  6. 6. 775 branches in the JIRA code base
  7. 7. Simplest Workflow keep master green master feature/DEV-30 feature/DEV-45 experiment on your feature branch
  8. 8. CI-friendly Repos WHY GIT? CI-FRIENDLY REPOS CI ON FEATURE BRANCHES GIT HOOKS FOR CI
  9. 9. Avoid tracking large files in your repo.
  10. 10. Just archive it
  11. 11. Shallow clones for the win
  12. 12. Photo: returndates.com Cache the repo on agents
  13. 13. Built into
  14. 14. CI on Feature Branches WHY GIT? CI-FRIENDLY REPOS CI ON FEATURE BRANCHES GIT HOOKS FOR CI
  15. 15. Simplest Workflow master feature/DEV-30 feature/DEV-45
  16. 16. Photo: Andres Galdamez Auto-detect new branches
  17. 17. Built into
  18. 18. automatically manually Branch Build Triggers v 1.2 master feature/DEV-30
  19. 19. But it’s not pure CI!
  20. 20. master sgd/DEV-30 Rebase before merging
  21. 21. how my changes will behave after merging to master master sgd/DEV-30 Rebase before merging
  22. 22. Auto-merge feature branches
  23. 23. Shallow clones for the win
  24. 24. Photo: returndates.com Cache the repo on agents
  25. 25. Auto-merge feature branches
  26. 26. Built into
  27. 27. Integration Workflow master integration feature/DEV-45 back to the drawing board…
  28. 28. 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
  29. 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. 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. 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. 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. 33. Free stuff! •SourceTree •atlassian.com/git
  34. 34. Thank you! SARAH GOFF-DUPONT • DEV TOOLS MARKETING • ATLASSIAN • @DEVTOOLSUPERFAN

×