Mesa (master): post_version.py: fix branch name construction for release candidates

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 5fba85bcb8bcb722e0bbaa54163d8a39d6fd067d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5fba85bcb8bcb722e0bbaa54163d8a39d6fd067d

Author: Eric Engestrom <eric at engestrom.ch>
Date:   Thu May  7 00:16:24 2020 +0200

post_version.py: fix branch name construction for release candidates

Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2870
Signed-off-by: Eric Engestrom <eric at engestrom.ch>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4929>

---

 bin/post_version.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/bin/post_version.py b/bin/post_version.py
index e05d177fe59..7ba24d8f737 100755
--- a/bin/post_version.py
+++ b/bin/post_version.py
@@ -37,6 +37,17 @@ def is_point_release(version: str) -> bool:
     return not version.endswith('.0')
 
 
+def is_release_candidate(version: str) -> bool:
+    return '-rc' in version
+
+
+def branch_name(version: str) -> str:
+    if is_release_candidate(version):
+        version = version.split('-')[0]
+    (major, minor, _) = version.split('.')
+    return f'{major}.{minor}'
+
+
 def update_index(is_point: bool, version: str) -> None:
     p = pathlib.Path(__file__).parent.parent / 'docs' / 'index.html'
     with p.open('rt') as f:
@@ -89,7 +100,7 @@ def update_calendar(version: str) -> None:
     with p.open('rt') as f:
         tree = html.parse(f)
 
-    base_version = version[:-2]
+    branch = branch_name(version)
 
     old = None
     new = None
@@ -100,7 +111,7 @@ def update_calendar(version: str) -> None:
             break
 
         for td in tr.xpath('./td'):
-            if td.text == base_version:
+            if td.text == branch:
                 old = tr
                 break