You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by we...@apache.org on 2018/09/19 10:30:54 UTC
spark git commit: [SPARK-25445][BUILD][FOLLOWUP] Resolve issues in
release-build.sh for publishing scala-2.12 build
Repository: spark
Updated Branches:
refs/heads/master 4193c7623 -> 5534a3a58
[SPARK-25445][BUILD][FOLLOWUP] Resolve issues in release-build.sh for publishing scala-2.12 build
## What changes were proposed in this pull request?
This is a follow up for #22441.
1. Remove flag "-Pkafka-0-8" for Scala 2.12 build.
2. Clean up the script, simpler logic.
3. Switch to Scala version to 2.11 before script exit.
## How was this patch tested?
Manual test.
Closes #22454 from gengliangwang/revise_release_build.
Authored-by: Gengliang Wang <ge...@databricks.com>
Signed-off-by: Wenchen Fan <we...@databricks.com>
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5534a3a5
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5534a3a5
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5534a3a5
Branch: refs/heads/master
Commit: 5534a3a58e4025624fbad527dd129acb8025f25a
Parents: 4193c76
Author: Gengliang Wang <ge...@databricks.com>
Authored: Wed Sep 19 18:30:46 2018 +0800
Committer: Wenchen Fan <we...@databricks.com>
Committed: Wed Sep 19 18:30:46 2018 +0800
----------------------------------------------------------------------
dev/create-release/release-build.sh | 38 +++++++++++++-------------------
1 file changed, 15 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/5534a3a5/dev/create-release/release-build.sh
----------------------------------------------------------------------
diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh
index 4c90a77..cce5f8b 100755
--- a/dev/create-release/release-build.sh
+++ b/dev/create-release/release-build.sh
@@ -111,21 +111,21 @@ fi
# different versions of Scala are supported.
BASE_PROFILES="-Pmesos -Pyarn"
PUBLISH_SCALA_2_10=0
-PUBLISH_SCALA_2_12=0
SCALA_2_10_PROFILES="-Pscala-2.10"
SCALA_2_11_PROFILES=
-SCALA_2_12_PROFILES="-Pscala-2.12 -Pkafka-0-8"
-
if [[ $SPARK_VERSION > "2.3" ]]; then
BASE_PROFILES="$BASE_PROFILES -Pkubernetes -Pflume"
SCALA_2_11_PROFILES="-Pkafka-0-8"
- if [[ $SPARK_VERSION > "2.4" ]]; then
- PUBLISH_SCALA_2_12=1
- fi
else
PUBLISH_SCALA_2_10=1
fi
+PUBLISH_SCALA_2_12=0
+SCALA_2_12_PROFILES="-Pscala-2.12"
+if [[ $SPARK_VERSION > "2.4" ]]; then
+ PUBLISH_SCALA_2_12=1
+fi
+
# Hive-specific profiles for some builds
HIVE_PROFILES="-Phive -Phive-thriftserver"
# Profiles for publishing snapshots and release to Maven Central
@@ -190,17 +190,9 @@ if [[ "$1" == "package" ]]; then
# Updated for each binary build
make_binary_release() {
NAME=$1
- SCALA_VERSION=$2
- SCALA_PROFILES=
- if [[ SCALA_VERSION == "2.10" ]]; then
- SCALA_PROFILES="$SCALA_2_10_PROFILES"
- elif [[ SCALA_VERSION == "2.12" ]]; then
- SCALA_PROFILES="$SCALA_2_12_PROFILES"
- else
- SCALA_PROFILES="$SCALA_2_11_PROFILES"
- fi
- FLAGS="$MVN_EXTRA_OPTS -B $SCALA_PROFILES $BASE_RELEASE_PROFILES $3"
- BUILD_PACKAGE=$4
+ FLAGS="$MVN_EXTRA_OPTS -B $BASE_RELEASE_PROFILES $2"
+ BUILD_PACKAGE=$3
+ SCALA_VERSION=$4
# We increment the Zinc port each time to avoid OOM's and other craziness if multiple builds
# share the same Zinc server.
@@ -210,10 +202,8 @@ if [[ "$1" == "package" ]]; then
cp -r spark spark-$SPARK_VERSION-bin-$NAME
cd spark-$SPARK_VERSION-bin-$NAME
- if [[ SCALA_VERSION == "2.10" ]]; then
- ./dev/change-scala-version.sh 2.10
- elif [[ SCALA_VERSION == "2.12" ]]; then
- ./dev/change-scala-version.sh 2.12
+ if [[ "$SCALA_VERSION" != "2.11" ]]; then
+ ./dev/change-scala-version.sh $SCALA_VERSION
fi
export ZINC_PORT=$ZINC_PORT
@@ -305,7 +295,7 @@ if [[ "$1" == "package" ]]; then
for key in ${!BINARY_PKGS_ARGS[@]}; do
args=${BINARY_PKGS_ARGS[$key]}
extra=${BINARY_PKGS_EXTRA[$key]}
- if ! make_binary_release "$key" "2.11" "$args" "$extra"; then
+ if ! make_binary_release "$key" "$SCALA_2_11_PROFILES $args" "$extra" "2.11"; then
error "Failed to build $key package. Check logs for details."
fi
done
@@ -314,7 +304,7 @@ if [[ "$1" == "package" ]]; then
key="without-hadoop-scala-2.12"
args="-Phadoop-provided"
extra=""
- if ! make_binary_release "$key" "2.12" "$args" "$extra"; then
+ if ! make_binary_release "$key" "$SCALA_2_12_PROFILES $args" "$extra" "2.12"; then
error "Failed to build $key package. Check logs for details."
fi
fi
@@ -446,6 +436,8 @@ if [[ "$1" == "publish-release" ]]; then
# Clean-up Zinc nailgun process
$LSOF -P |grep $ZINC_PORT | grep LISTEN | awk '{ print $2; }' | xargs kill
+ ./dev/change-scala-version.sh 2.11
+
pushd $tmp_repo/org/apache/spark
# Remove any extra files generated during install
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org