diff options
| author | Tim Hockin <thockin@google.com> | 2015-07-13 13:08:53 -0700 |
|---|---|---|
| committer | Tim Hockin <thockin@google.com> | 2015-07-13 13:08:53 -0700 |
| commit | be51e7d3b2cd7b124c1c183be45f3f1bb5f9811a (patch) | |
| tree | 9fba6c4cb3a81920b84dbb1138c4cfaef8d41875 | |
| parent | 01bb3613a48b76cfb0354376aedc1cfb2077bf1b (diff) | |
| parent | 92e08e130d859bb0a7dad654534906a2a92ed4a3 (diff) | |
Merge pull request #11099 from zmerlynn/fix-patch-version-instructions
Fix patch release instructions
| -rw-r--r-- | releasing.md | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/releasing.md b/releasing.md index a83f6677..29e685cf 100644 --- a/releasing.md +++ b/releasing.md @@ -114,10 +114,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 |