Skip to content

Commit ecf3768

Browse files
cloud-fangatorsmilewright
authored and
Raphaël Luta
committed
[SPARK-26048][SPARK-24530][2.4] Cherrypick all the missing commits to 2.4 release script
## What changes were proposed in this pull request? This PR is to cherry-pick all the missing and relevant commits that were merged to master but not to branch-2.4. Previously, dbtsai used the release script in the branch 2.4 to release 2.4.1. After more investigation, I found it is risky to make a 2.4 release by using the release script in the master branch since the release script has various changes. It could easily introduce unnoticeable issues, like what we did for 2.4.2. Thus, I would cherry-pick all the missing fixes and use the updated release script to release 2.4.3 ## How was this patch tested? N/A Closes apache#24503 from gatorsmile/upgradeReleaseScript. Lead-authored-by: Wenchen Fan <wenchen@databricks.com> Co-authored-by: gatorsmile <gatorsmile@gmail.com> Co-authored-by: wright <wright@semmle.com> Signed-off-by: gatorsmile <gatorsmile@gmail.com>
1 parent b658f5a commit ecf3768

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

dev/create-release/do-release-docker.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ if [ -n "$JAVA" ]; then
135135
JAVA_VOL="--volume $JAVA:/opt/spark-java"
136136
fi
137137

138+
# SPARK-24530: Sphinx must work with python 3 to generate doc correctly.
139+
echo "SPHINXPYTHON=/opt/p35/bin/python" >> $ENVFILE
140+
138141
echo "Building $RELEASE_TAG; output will be at $WORKDIR/output"
139142
docker run -ti \
140143
--env-file "$ENVFILE" \

dev/create-release/release-build.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ fi
122122

123123
PUBLISH_SCALA_2_12=0
124124
SCALA_2_12_PROFILES="-Pscala-2.12"
125+
if [[ $SPARK_VERSION < "3.0." ]]; then
126+
SCALA_2_12_PROFILES="-Pscala-2.12 -Pflume"
127+
fi
125128
if [[ $SPARK_VERSION > "2.4" ]]; then
126129
PUBLISH_SCALA_2_12=1
127130
fi
@@ -327,7 +330,7 @@ if [[ "$1" == "package" ]]; then
327330
svn add "svn-spark/${DEST_DIR_NAME}-bin"
328331

329332
cd svn-spark
330-
svn ci --username $ASF_USERNAME --password "$ASF_PASSWORD" -m"Apache Spark $SPARK_PACKAGE_VERSION"
333+
svn ci --username $ASF_USERNAME --password "$ASF_PASSWORD" -m"Apache Spark $SPARK_PACKAGE_VERSION" --no-auth-cache
331334
cd ..
332335
rm -rf svn-spark
333336
fi
@@ -355,7 +358,7 @@ if [[ "$1" == "docs" ]]; then
355358
svn add "svn-spark/${DEST_DIR_NAME}-docs"
356359

357360
cd svn-spark
358-
svn ci --username $ASF_USERNAME --password "$ASF_PASSWORD" -m"Apache Spark $SPARK_PACKAGE_VERSION docs"
361+
svn ci --username $ASF_USERNAME --password "$ASF_PASSWORD" -m"Apache Spark $SPARK_PACKAGE_VERSION docs" --no-auth-cache
359362
cd ..
360363
rm -rf svn-spark
361364
fi

dev/create-release/releaseutils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ def translate_component(component, commit_hash, warnings):
236236
# The returned components are already filtered and translated
237237
def find_components(commit, commit_hash):
238238
components = re.findall(r"\[\w*\]", commit.lower())
239-
components = [translate_component(c, commit_hash)
239+
components = [translate_component(c, commit_hash, [])
240240
for c in components if c in known_components]
241241
return components
242242

dev/create-release/spark-rm/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ RUN echo 'deb http://cran.cnr.Berkeley.edu/bin/linux/ubuntu xenial/' >> /etc/apt
6262
pip install $BASE_PIP_PKGS && \
6363
pip install $PIP_PKGS && \
6464
cd && \
65-
virtualenv -p python3 p35 && \
66-
. p35/bin/activate && \
65+
virtualenv -p python3 /opt/p35 && \
66+
. /opt/p35/bin/activate && \
6767
pip install $BASE_PIP_PKGS && \
6868
pip install $PIP_PKGS && \
6969
# Install R packages and dependencies used when building.

0 commit comments

Comments
 (0)