Repository: spark Updated Branches: refs/heads/master 5960686e7 -> 8f130ad40
[SPARK-22072][SPARK-22071][BUILD] Improve release build scripts ## What changes were proposed in this pull request? Check JDK version (with javac) and use SPARK_VERSION for publish-release ## How was this patch tested? Manually tried local build with wrong JDK / JAVA_HOME & built a local release (LFTP disabled) Author: Holden Karau <hol...@us.ibm.com> Closes #19312 from holdenk/improve-release-scripts-r2. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8f130ad4 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8f130ad4 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8f130ad4 Branch: refs/heads/master Commit: 8f130ad40178e35fecb3f2ba4a61ad23e6a90e3d Parents: 5960686 Author: Holden Karau <hol...@us.ibm.com> Authored: Fri Sep 22 00:14:57 2017 -0700 Committer: Holden Karau <hol...@us.ibm.com> Committed: Fri Sep 22 00:14:57 2017 -0700 ---------------------------------------------------------------------- dev/create-release/release-build.sh | 33 ++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/8f130ad4/dev/create-release/release-build.sh ---------------------------------------------------------------------- diff --git a/dev/create-release/release-build.sh b/dev/create-release/release-build.sh index f4a7f25..8de1d6a 100755 --- a/dev/create-release/release-build.sh +++ b/dev/create-release/release-build.sh @@ -31,8 +31,8 @@ Top level targets are All other inputs are environment variables GIT_REF - Release tag or commit to build from -SPARK_VERSION - Release identifier used when publishing -SPARK_PACKAGE_VERSION - Release identifier in top level package directory +SPARK_VERSION - Version of Spark being built (e.g. 2.1.2) +SPARK_PACKAGE_VERSION - Release identifier in top level package directory (e.g. 2.1.2-rc1) REMOTE_PARENT_DIR - Parent in which to create doc or release builds. REMOTE_PARENT_MAX_LENGTH - If set, parent directory will be cleaned to only have this number of subdirectories (by deleting old ones). WARNING: This deletes data. @@ -104,6 +104,33 @@ if [ -z "$SPARK_VERSION" ]; then | grep -v INFO | grep -v WARNING | grep -v Download) fi +# Verify we have the right java version set +if [ -z "$JAVA_HOME" ]; then + echo "Please set JAVA_HOME." + exit 1 +fi + +java_version=$("${JAVA_HOME}"/bin/javac -version 2>&1 | cut -d " " -f 2) + +if [[ ! $SPARK_VERSION < "2.2." ]]; then + if [[ $java_version < "1.8." ]]; then + echo "Java version $java_version is less than required 1.8 for 2.2+" + echo "Please set JAVA_HOME correctly." + exit 1 + fi +else + if [[ $java_version > "1.7." ]]; then + if [ -z "$JAVA_7_HOME" ]; then + echo "Java version $java_version is higher than required 1.7 for pre-2.2" + echo "Please set JAVA_HOME correctly." + exit 1 + else + JAVA_HOME="$JAVA_7_HOME" + fi + fi +fi + + if [ -z "$SPARK_PACKAGE_VERSION" ]; then SPARK_PACKAGE_VERSION="${SPARK_VERSION}-$(date +%Y_%m_%d_%H_%M)-${git_hash}" fi @@ -326,6 +353,8 @@ if [[ "$1" == "publish-snapshot" ]]; then fi if [[ "$1" == "publish-release" ]]; then + SPARK_VERSION=$SPARK_PACKAGE_VERSION + cd spark # Publish Spark to Maven release repo echo "Publishing Spark checkout at '$GIT_REF' ($git_hash)" --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
