X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0f644e242ef37c911ad3dc25aca8135c339de349..64e905e02fae8d63112be8a83b8f9f5f158fb2a2:/sdk/cwl/gittaggers.py diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py index 3fb0fdecd8..8ccb6645de 100644 --- a/sdk/cwl/gittaggers.py +++ b/sdk/cwl/gittaggers.py @@ -28,6 +28,10 @@ class EggInfoFromGit(egg_info): If a build tag has already been set (e.g., "egg_info -b", building from source package), leave it alone. """ + def git_latest_tag(self): + gitinfo = subprocess.check_output( + ['git', 'describe', '--abbrev=0']).strip() + return str(gitinfo.decode('utf-8')) def git_timestamp_tag(self): gitinfo = subprocess.check_output( @@ -37,5 +41,5 @@ class EggInfoFromGit(egg_info): def tags(self): if self.tag_build is None: - self.tag_build = self.git_timestamp_tag() + self.tag_build = self.git_latest_tag() + self.git_timestamp_tag() return egg_info.tags(self)