This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 692ec99bc78 [SPARK-44129][INFRA] Use "3.5.0" for "master" branch until
creating `branch-3.5`
692ec99bc78 is described below
commit 692ec99bc7884cc998afbf63e4ef53053c0c9dd7
Author: Hyukjin Kwon <[email protected]>
AuthorDate: Tue Jun 20 19:20:20 2023 -0700
[SPARK-44129][INFRA] Use "3.5.0" for "master" branch until creating
`branch-3.5`
### What changes were proposed in this pull request?
This adds a couple of changes to make the script working
See https://github.com/apache/spark/pull/41682
### Why are the changes needed?
See https://github.com/apache/spark/pull/41682
### Does this PR introduce _any_ user-facing change?
See https://github.com/apache/spark/pull/41682
### How was this patch tested?
See https://github.com/apache/spark/pull/41682
Closes #41684 from HyukjinKwon/SPARK-44129.
Authored-by: Hyukjin Kwon <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
dev/merge_spark_pr.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev/merge_spark_pr.py b/dev/merge_spark_pr.py
index 1621432c01c..e9024573a21 100755
--- a/dev/merge_spark_pr.py
+++ b/dev/merge_spark_pr.py
@@ -240,7 +240,8 @@ def cherry_pick(pr_num, merge_hash, default_branch):
def fix_version_from_branch(branch, versions):
# Note: Assumes this is a sorted (newest->oldest) list of un-released
versions
if branch == "master":
- return versions[0]
+ # TODO(SPARK-44130) Revert SPARK-44129 after creating branch-3.5
+ return [v for v in versions if v.name == "3.5.0"][0]
else:
branch_ver = branch.replace("branch-", "")
return list(filter(lambda x: x.name.startswith(branch_ver),
versions))[-1]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
