fix build tag for firmware

tarpn · Sep 20, 2023 · 2604c59 · 2604c59
1 parent 2012b84
commit 2604c59
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/firmware/build_flags.py b/firmware/build_flags.py
@@ -13,6 +13,6 @@
 )
 
 if __name__ == "__main__":
-    ver = setuptools_scm.get_version(root="..", tag_regex=TAG_REGEX)
+    ver = setuptools_scm.get_version(root="..", tag_regex=TAG_REGEX, git_describe_command="git describe --tags --match firmware-*")
     now = datetime.datetime.utcnow().replace(microsecond=0).isoformat()
     print(f"-DBUILD_VERSION='\"{ver}\"' -DBUILD_DATE='\"{now}Z\"'")
diff --git a/firmware/setup.py b/firmware/setup.py
@@ -4,12 +4,14 @@
 from setuptools import setup, find_packages
 import setuptools_scm
 
-TAG_REGEX = re.compile(
-    r"^firmware-(?:[\w-]+-)?(?P<version>[vV]?\d+(?:\.\d+){0,2}[^\+]*)(?:\+.*)?$"
-)
+TAG_REGEX = r"^firmware-(?:[\w-]+-)?(?P<version>[vV]?\d+(?:\.\d+){0,2}[^\+]*)(?:\+.*)?$"
+
 
 def get_version():
-    return setuptools_scm.get_version(root="..", tag_regex=TAG_REGEX)
+    return setuptools_scm.get_version(
+      root="..", 
+      tag_regex=TAG_REGEX,
+      git_describe_command="git describe --tags --match firmware-*")
 
 
 setup(