mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-07 07:08:04 +02:00
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@engestrom.ch>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4929>
(cherry picked from commit 5fba85bcb8)
This commit is contained in:
parent
404180c500
commit
ab0eed45b1
2 changed files with 14 additions and 3 deletions
|
|
@ -3028,7 +3028,7 @@
|
|||
"description": "post_version.py: fix branch name construction for release candidates",
|
||||
"nominated": false,
|
||||
"nomination_type": null,
|
||||
"resolution": 4,
|
||||
"resolution": 1,
|
||||
"master_sha": null,
|
||||
"because_sha": null
|
||||
},
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue