From 1916f6b81b134627712a6a987c1b1a6ae4a0e02c Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 3 Jul 2018 10:45:22 -0700 Subject: [PATCH 1/3] update release branch docs + remove storybook publishing docs --- RELEASING.md | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/RELEASING.md b/RELEASING.md index ba178d22a8..956e8624b3 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -3,19 +3,20 @@ ### In `primer/primer`: -1. Create a new release branch from `dev` and name it `release-`. - (CI will publish a release candidate version to npm for branches prefixed with `release`. These version numbers have a `rc.` suffix on them) +1. Go through the tracking PR and make sure everything that should be merged in is merged in. + +2. Once your builds finish, click on the details links for the continuous-integration/travis-ci/push build. Expand the `Deploying application` output and you should be able to find an outputted change log here. Copy this and update the [CHANGELOG.md](https://github.com/primer/primer/blob/master/CHANGELOG.md) file. -2. Go through the tracking issue and make sure everything that should be merged in is merged in. +3. Run the version bump in your terminal: `npm run bump`. -3. Once your builds finish, click on the details links for the continuous-integration/travis-ci/push build. Expand the `Deploying application` output and you should be able to find an outputted change log here. Copy this and update the [CHANGELOG.md](https://github.com/primer/primer/blob/master/CHANGELOG.md) file. +4. Test your changes with the latest release candidate version in the appropriate places (styleguide, storybook, github/github). -4. Run the version bump in your terminal: `npm run bump`. +5. Once the release PR is approved and you've done necessary testing, merge to `master`. This will trigger a publish to npm. -5. Test your changes with the latest release candidate version in the appropriate places (styleguide, storybook, github/github). +6. 1. Create a new release branch for the next release from `master` and name it `release-`. -6. Once the release PR is approved and you've done necessary testing, merge to `master`. This will trigger a publish to npm. + (CI will publish a release candidate version to npm for branches prefixed with `release`. These version numbers have a `rc.` suffix on them) ### In `github/github`: @@ -53,11 +54,6 @@ 1. Edit [index.html](https://github.com/primer/primer.github.io/blob/master/index.html) to include the latest version. -#### Update Storybook - -1. Pull the latest from master on primer/primer (after merging in release branch). - -2. Run `npm run publish-storybook`. #### Publish release tag From 89e0dd4b015b30b707a282031df899e683fa4e0a Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 3 Jul 2018 10:48:42 -0700 Subject: [PATCH 2/3] fix numbering --- RELEASING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASING.md b/RELEASING.md index 956e8624b3..493b2ff970 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -14,7 +14,7 @@ 5. Once the release PR is approved and you've done necessary testing, merge to `master`. This will trigger a publish to npm. -6. 1. Create a new release branch for the next release from `master` and name it `release-`. +6. Create a new release branch for the next release from `master` and name it `release-`. (CI will publish a release candidate version to npm for branches prefixed with `release`. These version numbers have a `rc.` suffix on them) From ece2c8a46327386d9db0a870b5efe4342061b09e Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 3 Jul 2018 11:02:59 -0700 Subject: [PATCH 3/3] tweak copy for change log instructions --- RELEASING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASING.md b/RELEASING.md index 493b2ff970..a564820e1b 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -6,7 +6,7 @@ 1. Go through the tracking PR and make sure everything that should be merged in is merged in. -2. Once your builds finish, click on the details links for the continuous-integration/travis-ci/push build. Expand the `Deploying application` output and you should be able to find an outputted change log here. Copy this and update the [CHANGELOG.md](https://github.com/primer/primer/blob/master/CHANGELOG.md) file. +2. To update the change log for your release, click on the details links for the continuous-integration/travis-ci/push build. Expand the `Deploying application` output and copy the change log content. Update the [CHANGELOG.md](https://github.com/primer/primer/blob/master/CHANGELOG.md) file with the change log content from the build. 3. Run the version bump in your terminal: `npm run bump`.