Skip to content

[ZEPPELIN-6089][INFRA][FOLLOWUP] Consider multiple digits when comparing version numbers #4851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 1, 2024
Merged

[ZEPPELIN-6089][INFRA][FOLLOWUP] Consider multiple digits when comparing version numbers #4851

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91db628
[ZEPPELIN-6089][INFRA][FOLLOWUP] Consider multiple digits when compar…
pan3793 Sep 29, 2024
201b05e
fix
pan3793 Sep 29, 2024
f2ffd2b
dedup
pan3793 Sep 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dev/merge_zeppelin_pr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
for x in versions
if not x.raw["released"] and not x.raw["archived"] and re.match(r"\d+\.\d+\.\d+", x.name)
]
versions = sorted(versions, key=lambda x: x.name, reverse=True)
versions = sorted(versions, key=lambda x: list(map(int, x.name.split('.'))), reverse=True)

default_fix_versions = []
for b in merge_branches:
Expand All @@ -288,7 +288,8 @@ def resolve_jira_issue(merge_branches, comment, default_jira_id=""):
# For example, assuming
# versions = ['4.0.0', '3.5.1', '3.5.0', '3.4.2', '3.3.4', '3.3.3']
# we've found two candidates for branch-3.5, we pick the last/smallest one
default_fix_versions.append(found_versions[-1])
if found_versions[-1] not in default_fix_versions:
default_fix_versions.append(found_versions[-1])
else:
print_error(
"Target version for %s is not found on JIRA, it may be archived or "
Expand Down Expand Up @@ -538,8 +539,7 @@ def main():

branches = http_get("%s/branches" % GITHUB_API_BASE)
branch_names = list(filter(lambda x: x.startswith("branch-"), [x["name"] for x in branches]))
# Assumes branch names can be sorted lexicographically
branch_names = sorted(branch_names, reverse=True)
branch_names = sorted(branch_names, key=lambda x: list(map(int, x.removeprefix("branch-").split('.'))), reverse=True)
branch_iter = iter(branch_names)

pr_num = bold_input("Which pull request would you like to merge? (e.g. 34): ")
Expand Down
Loading