From ceecb3268383779e9ea895b79f8816911e7e75d7 Mon Sep 17 00:00:00 2001 From: eine Date: Sat, 10 Oct 2020 19:52:19 +0200 Subject: [PATCH] accept semver tags starting with 'v' --- tip.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tip.py b/tip.py index eb9d894..d5d5762 100755 --- a/tip.py +++ b/tip.py @@ -69,7 +69,10 @@ is_draft = False if gh_ref[0:10] == 'refs/tags/': env_tag = gh_ref[10:] if env_tag != tag: - semver = re.search(r"^(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)(?:-(?P(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$", env_tag) + rexp = r"^(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)\.(?P0|[1-9]\d*)(?:-(?P(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$" + semver = re.search(rexp, env_tag) + if semver == None and env_tag[0] == 'v': + semver = re.search(rexp, env_tag[1:]) tag = env_tag if semver.group('prerelease') is None: # is a regular semver compilant tag