uc san diego campus lisa 2014 - source code management

14
Source Code Management Campus LISA July 9, 2014 Matt Critchlow Manager of Development and Web Services

Upload: matthew-critchlow

Post on 15-Jan-2015

153 views

Category:

Technology


3 download

DESCRIPTION

An overview of how the UC San Diego Library development team uses Git, Github, Stash with the Git Flow workflow for development, continuous integration and release management.

TRANSCRIPT

Page 1: UC San Diego Campus LISA 2014 - Source Code Management

Source Code Management

Campus LISA

July 9, 2014Matt Critchlow

Manager of Development and Web Services

Page 2: UC San Diego Campus LISA 2014 - Source Code Management

Questions

• Who is using a version control system in their current position?

• Who is using Github, either personally or professionally?

• Who develops code entirely on their own?

Page 3: UC San Diego Campus LISA 2014 - Source Code Management

Background

• UC San Diego Library Development Team

• 6 Developers

• Open-Source repositories: 3

• Internal repositories: 46

Page 4: UC San Diego Campus LISA 2014 - Source Code Management

Version Control

Source: http://git-scm.com, http://github.com, http://atlassian.com/software/stash

Page 5: UC San Diego Campus LISA 2014 - Source Code Management

Github

• Social Coding – 6 mil+ people

• Collaboration with community projects– https://github.com/projecthydra– https://github.com/projectblacklight/– https://github.com/fcrepo4

• Best Practices are inherited

Page 6: UC San Diego Campus LISA 2014 - Source Code Management

Stash

• Internal Projects

• Git under the hood

• User interface similar to Github

• JIRA Integration

Page 7: UC San Diego Campus LISA 2014 - Source Code Management

Git Flow

Source: http://nvie.com/posts/a-successful-git-branching-model/

Page 8: UC San Diego Campus LISA 2014 - Source Code Management

Git Flow: Primary Branches

Source: http://nvie.com/posts/a-successful-git-branching-model/

Page 9: UC San Diego Campus LISA 2014 - Source Code Management

Git Flow Git Extensions

Source: https://github.com/nvie/gitflow

Page 10: UC San Diego Campus LISA 2014 - Source Code Management

Git Flow: New Feature

Source: http://nvie.com/posts/a-successful-git-branching-model/

Page 11: UC San Diego Campus LISA 2014 - Source Code Management

Git Flow: Release

Page 12: UC San Diego Campus LISA 2014 - Source Code Management

Git Flow: OH CRAP!

Source: http://nvie.com/posts/a-successful-git-branching-model/

Page 13: UC San Diego Campus LISA 2014 - Source Code Management

Other Workflows

• Git Tags and Branches

• Spencer and Tom’s workflows

• Subversion has equivalents

• Goal: Consistent workflow that works for your team

Page 14: UC San Diego Campus LISA 2014 - Source Code Management

References

Library on Github: https://github.com/ucsdlib/

Git Flow: https://github.com/nvie/gitflow

Atlassian Stash: https://www.atlassian.com/software/stash

Contact: @mattcritchlow, [email protected]