From 3d14e4ff279db2b15cd2f871728c43065a3a4730 Mon Sep 17 00:00:00 2001 From: Seth Michael Larson Date: Mon, 23 Nov 2020 17:33:00 -0600 Subject: [PATCH] [7.x] Handle qualified version snapshots with make.sh Co-authored-by: Seth Michael Larson --- utils/build-dists.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build-dists.py b/utils/build-dists.py index 904df6f3..ecd559db 100644 --- a/utils/build-dists.py +++ b/utils/build-dists.py @@ -193,7 +193,7 @@ def main(): version = version + pre_number.group(1) + pre_number.group(2) expect_version = re.sub( - r"-(?:SNAPSHOT|alpha\d+|beta\d+|rc\d+)$", "", expect_version + r"(?:-(?:SNAPSHOT|alpha\d+|beta\d+|rc\d+))+$", "", expect_version ) if expect_version.endswith(".x"): expect_version = expect_version[:-1]