diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2018-06-16 23:36:39 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2018-06-16 23:36:39 +1200 |
| commit | 58c93a233b5fbdb7b0107a4fc045a71cee9f0ead (patch) | |
| tree | b6ad97acbd85eab5604694d8eedcdf41f3fc03f3 /release | |
| parent | 94a22b87954af42d552d2d94a845e764df0d4587 (diff) | |
| download | mitmproxy-58c93a233b5fbdb7b0107a4fc045a71cee9f0ead.tar.gz mitmproxy-58c93a233b5fbdb7b0107a4fc045a71cee9f0ead.tar.bz2 mitmproxy-58c93a233b5fbdb7b0107a4fc045a71cee9f0ead.zip | |
CHANGELOG, release/README updates
We no longer care about annotated tags.
Diffstat (limited to 'release')
| -rw-r--r-- | release/README.md | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/release/README.md b/release/README.md index 01a8d7dd..a34f1793 100644 --- a/release/README.md +++ b/release/README.md @@ -7,14 +7,11 @@ release for! The command examples assume that you have a git remote called - Verify that `mitmproxy/version.py` is correct - Update CHANGELOG - Verify that all CI tests pass -- Create a major version branch - e.g. `v4.x`. Assuming you have a remote repo called `upstream` that points to the mitmproxy/mitmproxy repo:: +- If needed, create a major version branch - e.g. `v4.x`. Assuming you have a remote repo called `upstream` that points to the mitmproxy/mitmproxy repo:: - `git checkout -b v4.x upstream/master` - `git push -u upstream v4.x` - Tag the release and push to Github - - For alphas, betas, and release candidates, use lightweight tags. This is - necessary so that the .devXXXX counter does not reset. - - For final releases, use annotated tags. This makes the .devXXXX counter reset. - - `git tag -a v4.0.0 -m v4.0.0` + - `git tag v4.0.0` - `git push upstream v4.0.0` - Wait for tag CI to complete |