Skip to content

[SPARK-45008][INFRA] Improve branch suggestion for backporting#42723

Closed
yaooqinn wants to merge 1 commit intoapache:masterfrom
yaooqinn:SPARK-45008
Closed

[SPARK-45008][INFRA] Improve branch suggestion for backporting#42723
yaooqinn wants to merge 1 commit intoapache:masterfrom
yaooqinn:SPARK-45008

Conversation

@yaooqinn
Copy link
Member

What changes were proposed in this pull request?

This PR automatically iterates to the next branch to be merged instead of using the latest all the time

Why are the changes needed?

anti-misoperation

Does this PR introduce any user-facing change?

no

How was this patch tested?

Was this patch authored or co-authored using generative AI tooling?

Locally tested

>>> def get_json(url):
...     try:
...         request = Request(url)
...         if GITHUB_OAUTH_KEY:
...             request.add_header("Authorization", "token %s" % GITHUB_OAUTH_KEY)
...         return json.load(urlopen(request))
...     except HTTPError as e:
...         if "X-RateLimit-Remaining" in e.headers and e.headers["X-RateLimit-Remaining"] == "0":
...             print(
...                 "Exceeded the GitHub API rate limit; see the instructions in "
...                 + "dev/merge_spark_pr.py to configure an OAuth token for making authenticated "
...                 + "GitHub requests."
...             )
...         else:
...             print("Unable to fetch URL, exiting: %s" % url)
...         sys.exit(-1)
...
>>> branches = get_json("%s/branches" % GITHUB_API_BASE)
>>>
>>> branch_names = list(filter(lambda x: x.startswith("branch-"), [x["name"] for x in branches]))
>>> branch_names = sorted(branch_names, reverse=True)
>>> branch_iter = iter(branch_names)
>>> print(next(branch_iter, branch_names[0]))
branch-3.5
>>> print(next(branch_iter, branch_names[0]))
branch-3.4
>>> print(next(branch_iter, branch_names[0]))
branch-3.3
>>> print(next(branch_iter, branch_names[0]))
branch-3.2
>>> print(next(branch_iter, branch_names[0]))
branch-3.1
>>> print(next(branch_iter, branch_names[0]))
branch-3.0
>>> print(next(branch_iter, branch_names[0]))
branch-2.4
>>> print(next(branch_iter, branch_names[0]))
branch-2.3
>>> print(next(branch_iter, branch_names[0]))
branch-2.2
>>> print(next(branch_iter, branch_names[0]))
branch-2.1
>>> print(next(branch_iter, branch_names[0]))
branch-2.0
>>> print(next(branch_iter, branch_names[0]))
branch-1.6
>>> print(next(branch_iter, branch_names[0]))
branch-1.5
>>> print(next(branch_iter, branch_names[0]))
branch-1.4
>>> print(next(branch_iter, branch_names[0]))
branch-1.3
>>> print(next(branch_iter, branch_names[0]))
branch-1.2
>>> print(next(branch_iter, branch_names[0]))
branch-1.1
>>> print(next(branch_iter, branch_names[0]))
branch-1.0-jdbc
>>> print(next(branch_iter, branch_names[0]))
branch-1.0
>>> print(next(branch_iter, branch_names[0]))
branch-0.9
>>> print(next(branch_iter, branch_names[0]))
branch-0.8
>>> print(next(branch_iter, branch_names[0]))
branch-0.7
>>> print(next(branch_iter, branch_names[0]))
branch-0.6
>>> print(next(branch_iter, branch_names[0]))
branch-0.5
>>> print(next(branch_iter, branch_names[0]))
branch-3.5
>>> quit()

@yaooqinn
Copy link
Member Author

cc @dongjoon-hyun @HyukjinKwon @cloud-fan thanks

Copy link
Member

@dongjoon-hyun dongjoon-hyun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, LGTM.

@yaooqinn
Copy link
Member Author

thank you @dongjoon-hyun

@yaooqinn yaooqinn deleted the SPARK-45008 branch August 30, 2023 06:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants