apply release name fix in release version generator script

DanielMiao1 · Apr 16, 2023 · 3a092e6 · 3a092e6
1 parent 8fada73
commit 3a092e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.github/workflows/generate_release_version.py b/.github/workflows/generate_release_version.py
@@ -1,5 +1,6 @@
-import subprocess
 import datetime
+import re
+import subprocess
 
 tags_process = subprocess.Popen(["git", "for-each-ref", "--sort=creatordate", "--format", "'%(refname) %(taggerdate)'", "refs/tags"], stdout=subprocess.PIPE)
 tags = ""
@@ -17,6 +18,6 @@
 		continue
 
 	time = datetime.datetime.utcnow().strftime("%Y%m%d%H%M%S")
+	tag = re.sub(r"\+\d+", "", tag)
 	print(f"{tag}+{time}")
 	break
-
diff --git a/generate_next_release.py b/generate_next_release.py
@@ -1,5 +1,6 @@
-import subprocess
 import datetime
+import re
+import subprocess
 
 tags_process = subprocess.Popen(["git", "for-each-ref", "--sort=creatordate", "--format", "'%(refname) %(taggerdate)'", "refs/tags"], stdout=subprocess.PIPE)
 tags = ""
@@ -17,5 +18,6 @@
 		continue
 
 	time = datetime.datetime.utcnow().strftime("%Y%m%d%H%M%S")
+	tag = re.sub(r"\+\d+", "", tag)
 	print(f"{tag}+{time}")
 	break