build: allow for rc3/rc4 style tags 05/29005/2
authorAndrew Yourtchenko <ayourtch@gmail.com>
Tue, 22 Sep 2020 16:04:35 +0000 (16:04 +0000)
committerDave Wallace <dwallacelf@gmail.com>
Wed, 23 Sep 2020 15:20:53 +0000 (15:20 +0000)
Historically, there was only rc1/rc2 tags, fix in case we tag
rc3/rc4 during longer release windows.

Type: fix
Change-Id: I4243a1c03663a877f96a06d647e89adb74abd977
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
(cherry picked from commit bc31247c921d9bad94f2d4aeca9041aee518e7a6)

src/scripts/version

index 7e77116..455ab76 100755 (executable)
@@ -36,7 +36,7 @@ if [ -z "${POINT}" ]; then
     # verify that we are not:
     # - directly on the XX.YY tag (then ADD will equal "0" by its construction)
     # - not on any of the builds past "-rc[123]" but before releases - then ADD will be "rc[123]"
-    if [ "${ADD}" != "0" -a "${ADD}" != "rc0" -a "${ADD}" != "rc1" -a "${ADD}" != "rc2" ]; then
+    if [ "${ADD}" != "0" -a "${ADD}" != "rc0" -a "${ADD}" != "rc1" -a "${ADD}" != "rc2" -a "${ADD}" != "rc3" -a "${ADD}" != "rc4" ]; then
        TAG="${TAG}.0"
     fi
 fi