Skip to content

Instantly share code, notes, and snippets.

@matt-stj
Last active March 6, 2018 19:31
Show Gist options
  • Save matt-stj/39d1dd604aab265d796dc11d998e9439 to your computer and use it in GitHub Desktop.
Save matt-stj/39d1dd604aab265d796dc11d998e9439 to your computer and use it in GitHub Desktop.
How to cut release branches for Peak repos

When shipping code for an upcoming release, we're responsible for creating release branches (and closing previous ones) for any of the following repos with new code changes:

  • peak
  • legistarweb
  • chronus
  • atreyu

We use git flow to manage our branches around releases, so be sure to set it up and read through the docs here if you don't already have it.

  1. Before cutting new release branches, make sure all open release/hotfix branches are closed.

You can tell by looking at the releases page on [Github] (https://github.com/Granicus/peak/releases). There should be a release entry and a corresponding tag for the prior release. (You can also look in the active branches on the repo to see if a release branch still exists).

  1. If you see an old release branch on github that isn't finished, you'll have to go ahead and do that before starting a new one.
  • git checkout develop && git pull
  • git checkout master && git pull
  • git checkout release/previous_release_branch
  • git flow release finish release/previous_release_branch

(when you do release finish you'll have to do a few :wqs for commiting the merge of the branches. One of them is creating the release tag. Make sure that tag matches the release name like 20180209)

Then you'll have to push up the tags, so from develop:

  • git push
  • git push --tags
  • git checkout master && git push
  1. Now open new release branch from develop
  • git checkout develop && git pull
  • git flow release start 20180309 (YYYYMMDD)
  1. Publish release branch
  • git flow release publish
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment