Merge branch 'wtsi/13809-root_url-protocol-port-configuration'

[arvados.git] / sdk / cwl / gittaggers.py

diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py
index 2a292ee061b412d85216c68b81e2d0acd9557765..8ccb6645de8c78ccf77d3e049fa1b1e6257e5c91 100644 (file)
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+
 from setuptools.command.egg_info import egg_info
 import subprocess
 import time
@@ -24,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(
@@ -33,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)