diff options
| author | Zach Loafman <zml@google.com> | 2015-07-10 18:43:12 -0700 |
|---|---|---|
| committer | Zach Loafman <zml@google.com> | 2015-07-10 18:43:12 -0700 |
| commit | 92e08e130d859bb0a7dad654534906a2a92ed4a3 (patch) | |
| tree | 5193e6a9075db3e392eedb0dce33de99b29643d9 | |
| parent | 3a38ce4217962abf1ebd37e08ea51c5c857de70e (diff) | |
Fix patch release instructions
Somewhere in the last round of editing, I compressed the patch release
instructions after the release validation steps went in. They no
longer made sense because they assume some variables are set from the
previous step that you don't have set. Set them.
These instructions are now begging to be refactored between the patch
and normal releases, but I won't do that here.
| -rw-r--r-- | releasing.md | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/releasing.md b/releasing.md index 6533858c..9e9fcaf7 100644 --- a/releasing.md +++ b/releasing.md @@ -100,10 +100,13 @@ manage cherry picks prior to cutting the release. #### Tagging and Merging -Do the following (you still have `${VER}` set and you're still working on the -`release-${VER}` branch, right?): - +1. `export VER=x.y` (e.g. `0.20` for v0.20) 1. `export PATCH=Z` where `Z` is the patch level of `vX.Y.Z` +1. cd to the base of the repo +1. `git fetch upstream && git checkout -b upstream/release-${VER}` +1. Make sure you don't have any files you care about littering your repo (they + better be checked in or outside the repo, or the next step will delete them). +1. `make clean && git reset --hard HEAD && git clean -xdf` 1. `make` (TBD: you really shouldn't have to do this, but the swagger output step requires it right now) 1. `./build/mark-new-version.sh v${VER}.${PATCH}` to mark the new release and get further instructions. This creates a series of commits on the branch you're working |