justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 00:14:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a version parsing issue when on a tagged version

Browse Source
This commit is contained in:
Justin C. Miller
2019-02-03 00:06:39 -08:00
parent e1d8dd3124
commit c4dc52c06c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
generate_build.py
View File

@@ -53,10 +53,14 @@ def get_sources(path, srcroot):
def get_git_version(): def get_git_version():
from subprocess import run from subprocess import run
cp = run(['git', 'describe', '--dirty', '--abbrev=7'], cp = run(['git', 'describe', '--dirty'],
check=True, capture_output=True) check=True, capture_output=True)
full_version = cp.stdout.decode('utf-8').strip() full_version = cp.stdout.decode('utf-8').strip()
cp = run(['git', 'rev-parse', 'HEAD'],
check=True, capture_output=True)
full_sha = cp.stdout.decode('utf-8').strip()
dirty = False dirty = False
parts1 = full_version.split('-') parts1 = full_version.split('-')
if parts1[-1] == "dirty": if parts1[-1] == "dirty":
@@ -69,7 +73,7 @@ def get_git_version():
parts2[0], parts2[0],
parts2[1], parts2[1],
parts2[2], parts2[2],
parts1[-1][1:], full_sha[:7],
dirty) dirty)