From 0e9582731eee10cc6ff6c4fbd0054ecd1a75afea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20O=E2=80=99Shannessy?= Date: Wed, 11 Jan 2017 10:08:18 -0800 Subject: [PATCH 1/2] Add error codes update to release process --- scripts/release-manager/Readme.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/scripts/release-manager/Readme.md b/scripts/release-manager/Readme.md index 0f767ab4655c0..583ab97684201 100644 --- a/scripts/release-manager/Readme.md +++ b/scripts/release-manager/Readme.md @@ -187,6 +187,26 @@ git commit -am 'Update shrinkwrap' If you’re feeling extra careful, you can run `npm test` again. +### Update the Error Codes + + +**This step is only necessary for a stable release.** +If you’re just cutting an alpha, you should skip it. + +Run this so that `scripts/error-codes/codes.json` is up to date: + +``` +gulp react:extract-errors +``` + +Check `git diff`. Do changes look sensible? + +Commit your changes: + +``` +git commit -am 'Update error codes' +``` + ### Write the Changelog **This step is only necessary for a stable release.** From 9179abcb3f007c66426174c0e96b24631d8a892a Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Thu, 12 Jan 2017 15:11:55 +0000 Subject: [PATCH 2/2] Update --- scripts/release-manager/Readme.md | 70 ++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 20 deletions(-) diff --git a/scripts/release-manager/Readme.md b/scripts/release-manager/Readme.md index 583ab97684201..b16c8bb044a50 100644 --- a/scripts/release-manager/Readme.md +++ b/scripts/release-manager/Readme.md @@ -141,6 +141,29 @@ You can fix them in a separate commit. **Tip:** tests might also be failing if dependency versions are incorrect. You might want to run `yarn` first since sometimes `package.json` on master is different from the stable branches. +### Update the Error Codes + +**This step is only necessary for a stable release.** +If you’re just cutting an alpha, you should skip it. + +Run this so that `scripts/error-codes/codes.json` is up to date: + +``` +./node_modules/.bin/gulp react:extract-errors +``` + +Check `git diff`. Do changes, if any, look sensible? + +If there are any changes, commit them: + +``` +git commit -am 'Update error codes' +``` + +You will see the commit hash. Copy it in your editor. You will need it later to cherry-pick the error codes update to master. + +If there were no changes, it’s also fine. + ### Push and Choose the Branch If you followed the guide correctly (and ran `start-release` in the beginning), you should be on a “stable development” branch such as `15-dev`. Now is a good time to push the development branch: @@ -187,26 +210,6 @@ git commit -am 'Update shrinkwrap' If you’re feeling extra careful, you can run `npm test` again. -### Update the Error Codes - - -**This step is only necessary for a stable release.** -If you’re just cutting an alpha, you should skip it. - -Run this so that `scripts/error-codes/codes.json` is up to date: - -``` -gulp react:extract-errors -``` - -Check `git diff`. Do changes look sensible? - -Commit your changes: - -``` -git commit -am 'Update error codes' -``` - ### Write the Changelog **This step is only necessary for a stable release.** @@ -350,6 +353,33 @@ Looks good? Push it. git push ``` +### Cherry-Pick the Error Codes + +**This step is only necessary for a stable release.** +If you’re just cutting an alpha, you should skip it. + +If error codes were updated, you were supposed to commit that earlier and record the commit hash. + +Did this happen? + +If so, cherry-pick it to `master` as well: + +``` +git cherry-pick +``` + +Verify you picked the right commit: + +``` +git diff HEAD~ +``` + +Looks good? Push it. + +``` +git push +``` + ### Creating a GitHub Release **This step is only necessary for a stable release.**