This is an automated email from the ASF dual-hosted git repository.

gurwls223 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 3f2c623969ac [SPARK-53689][BUILD][FOLLOW-UP] Respect RELEASE_VERSION 
environment variable if already defined
3f2c623969ac is described below

commit 3f2c623969acaaccc56b0d82172cc00495685c69
Author: Hyukjin Kwon <[email protected]>
AuthorDate: Wed Sep 24 15:46:52 2025 +0900

    [SPARK-53689][BUILD][FOLLOW-UP] Respect RELEASE_VERSION environment 
variable if already defined
    
    ### What changes were proposed in this pull request?
    
    This PR fixes the release script to respect RELEASE_VERSION environment 
variable if already defined.
    This PR is a followup of https://github.com/apache/spark/pull/52430
    
    ### Why are the changes needed?
    
    Otherwise, pre-defined `RELEASE_VERSION` does not work.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No, dev-only.
    
    ### How was this patch tested?
    
    Manually.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    
    No.
    
    Closes #52432 from HyukjinKwon/SPARK-53689-followup.
    
    Authored-by: Hyukjin Kwon <[email protected]>
    Signed-off-by: Hyukjin Kwon <[email protected]>
---
 dev/create-release/release-util.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev/create-release/release-util.sh 
b/dev/create-release/release-util.sh
index 74d91d624c2f..41b2d054e15e 100755
--- a/dev/create-release/release-util.sh
+++ b/dev/create-release/release-util.sh
@@ -107,8 +107,9 @@ function get_release_info {
 
   NEXT_VERSION="$VERSION"
   if [ -z "$RELEASE_VERSION" ]; then
-    RELEASE_VERSION="${VERSION/-SNAPSHOT/}"
+    SPARK_RELEASE_VERSION="$RELEASE_VERSION"
   fi
+  RELEASE_VERSION="${VERSION/-SNAPSHOT/}"
   SHORT_VERSION=$(echo "$VERSION" | cut -d . -f 1-2)
   local REV=$(echo "$RELEASE_VERSION" | cut -d . -f 3)
 
@@ -138,6 +139,11 @@ function get_release_info {
 
   if [ "$GIT_BRANCH" = "master" ]; then
     RELEASE_VERSION="$RELEASE_VERSION-preview1"
+    if [ -n "$SPARK_RELEASE_VERSION" ]; then
+      # If we are building it from master branch, respect the RELEASE_VERSION
+      # set before. This is usually a preview release.
+      RELEASE_VERSION="$SPARK_RELEASE_VERSION"
+    fi
   fi
   export NEXT_VERSION
   export RELEASE_VERSION=$(read_config "Release" "$RELEASE_VERSION")


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to