Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-26 10:16:27 +00:00
Code Issues Projects Releases Wiki Activity

only use annotated tags for version calculation

Browse Source
This commit is contained in:
Maximilian Hils 2018-01-07 20:25:27 +01:00
parent 94a173ab9c
commit 15f525e86b
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mitmproxy/version.py
View File

@ -33,7 +33,7 @@ def get_version(dev: bool = False, build: bool = False, refresh: bool = False) -
here = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) here = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
try: try:
git_describe = subprocess.check_output( git_describe = subprocess.check_output(
['git', 'describe', '--tags', '--long'], ['git', 'describe', '--long'],
stderr=subprocess.STDOUT, stderr=subprocess.STDOUT,
cwd=here, cwd=here,
) )

4
release/README.md
View File

@ -5,6 +5,10 @@ Make sure run all these steps on the correct branch you want to create a new rel
- Update CHANGELOG - Update CHANGELOG
- Verify that all CI tests pass - Verify that all CI tests pass
- Tag the release and push to Github - 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.
- Wait for tag CI to complete - Wait for tag CI to complete
## GitHub Release ## GitHub Release

2
test/mitmproxy/test_version.py
View File

@ -32,5 +32,5 @@ def test_get_version():
m.return_value = b"tag-2-cafecafe" m.return_value = b"tag-2-cafecafe"
assert version.get_version(True, True) == "3.0.0.dev2-0xcafecaf" assert version.get_version(True, True) == "3.0.0.dev2-0xcafecaf"
m.side_effect = subprocess.CalledProcessError(-1, 'git describe --tags --long') m.side_effect = subprocess.CalledProcessError(-1, 'git describe --long')
assert version.get_version(True, True) == "3.0.0" assert version.get_version(True, True) == "3.0.0"