Continuous Integration: Fighting the Fear

The Fear

Continuous what?

GIT

  • master is our current production release. No one has permission to push into this branch, it can only be merged via Stash. Stash is a bit like github but aimed at the enterprise. Stash gives us some extra restrictions as well, we restrict any history changes and we also refuse any pull requests without passing builds (more on this later).
  • release is our current staging or UAT branch. Again no one has permission to push into this branch and it has the same restrictions around passing builds. Once we have finished testing a pull request can be made and merged when the project lead is ready.
  • develop is our current integrated build. All other feature branches need to be merged into this branch to move towards a release. Depending on the project size, pull requests are sometimes required so that code can be reviewed by one of the senior team members. Stash gives us the ability to restrict how many approvals are required for a merge and by which group of people.

TeamCity

Octopus Deploy

The big picture

What does this mean for your team?

--

--

--

Love podcasts or audiobooks? Learn on the go with our new app.

Get the Medium app

A button that says 'Download on the App Store', and if clicked it will lead you to the iOS App store
A button that says 'Get it on, Google Play', and if clicked it will lead you to the Google Play store
Ben Gale

Ben Gale

More from Medium

Azure | Lift your ARM with Bicep

Increasing signal to noise ratio for Mitel systems

Kubernetes Deployment Strategies

How to cross-charge shared Reservations based on Azure Cost Management billing data

Figure 2 — Cost Analysis in Cost Management + Billing