(spark) branch master updated: [SPARK-51617][BUILD] Explicitly commit/revert jar removals

[gu...@apache.org]

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 0d2a06be7747 [SPARK-51617][BUILD] Explicitly commit/revert jar removals
0d2a06be7747 is described below

commit 0d2a06be7747a32586b6d7d570abb67c56b26f37
Author: Hyukjin Kwon <gu...@apache.org>
AuthorDate: Thu Mar 27 09:49:29 2025 +0900

    [SPARK-51617][BUILD] Explicitly commit/revert jar removals
    
    ### What changes were proposed in this pull request?
    
    This PR explicitly commit/revert jar removals in the release process.
    
    ### Why are the changes needed?
    
    To explicitly record the removals in commit history.
    
    ### Does this PR introduce _any_ user-facing change?
    
    No, dev-only.
    
    ### How was this patch tested?
    
    I manually tested individual commands. I will work together with release manager to verify this.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    
    No.
    
    Closes #50415 from HyukjinKwon/SPARK-51617.
    
    Authored-by: Hyukjin Kwon <gu...@apache.org>
    Signed-off-by: Hyukjin Kwon <gu...@apache.org>
---
 dev/create-release/release-tag.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dev/create-release/release-tag.sh b/dev/create-release/release-tag.sh
index 0c7f3eb66a78..8d3ea88796a4 100755
--- a/dev/create-release/release-tag.sh
+++ b/dev/create-release/release-tag.sh
@@ -73,6 +73,11 @@ cd spark
 git config user.name "$GIT_NAME"
 git config user.email "$GIT_EMAIL"
 
+# Remove test jars that do not belong to source releases.
+rm $(<dev/test-jars.txt)
+git commit -a -m "Removing test jars"
+JAR_RM_REF=$(git rev-parse HEAD)
+
 # Create release version
 $MVN versions:set -DnewVersion=$RELEASE_VERSION | grep -v "no value" # silence logs
 if [[ $RELEASE_VERSION != *"preview"* ]]; then
@@ -91,6 +96,9 @@ git commit -a -m "Preparing Spark release $RELEASE_TAG"
 echo "Creating tag $RELEASE_TAG at the head of $GIT_BRANCH"
 git tag $RELEASE_TAG
 
+# Restore test jars for dev.
+git revert --no-edit $JAR_RM_REF
+
 # Create next version
 $MVN versions:set -DnewVersion=$NEXT_VERSION | grep -v "no value" # silence logs
 # Remove -SNAPSHOT before setting the R version as R expects version strings to only have numbers
@@ -106,8 +114,6 @@ sed -i".tmp7" 's/SPARK_VERSION:.*$/SPARK_VERSION: '"$NEXT_VERSION"'/g' docs/_con
 sed -i".tmp8" 's/SPARK_VERSION_SHORT:.*$/SPARK_VERSION_SHORT: '"$R_NEXT_VERSION"'/g' docs/_config.yml
 # Update the version index of DocSearch as the short version
 sed -i".tmp9" "s/'facetFilters':.*$/'facetFilters': [\"version:$R_NEXT_VERSION\"]/g" docs/_config.yml
-# Remove test jars that do not beling to source releases.
-rm $(<dev/test-jars.txt)
 
 git commit -a -m "Preparing development version $NEXT_VERSION"
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org