[SPARK-22072][SPARK-22071][BUILD]Improve release build scripts #19312
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
cc @JoshRosen |
srowen
approved these changes
Sep 21, 2017
|
Test build #82048 has finished for PR 19312 at commit
|
|
retest this please |
|
Test build #82056 has finished for PR 19312 at commit
|
HyukjinKwon
reviewed
Sep 22, 2017
dev/create-release/release-build.sh
Outdated
| @@ -95,6 +95,28 @@ if [ -z "$SPARK_VERSION" ]; then | |||
| | grep -v INFO | grep -v WARNING | grep -v Download) | |||
| fi | |||
|
|
|||
| # Verify we have the right java version set | |||
| java_version=$("${JAVA_HOME}"/bin/javac -version 2>&1 | cut -d " " -f 2) | |||
There was a problem hiding this comment.
@holdenk, should we maybe catch the case when JAVA_HOME is missing too?
If so, I think we could do something like ...
if [ -z "$JAVA_HOME" ]; then
echo "Please set JAVA_HOME."
exit 1
fi
...Or maybe...
if [[ -x "$JAVA_HOME/bin/javac" ]]; then
javac_cmd="$JAVA_HOME/bin/javac"
else
javac_cmd=javac
fi
java_version=$("$javac_cmd" -version 2>&1 | cut -d " " -f 2)
...I tested both in my local.
There was a problem hiding this comment.
Thanks. The logic we use in make-distribution to resolve JAVA_HOME when not set is a bit more complicated, but I think for the release script its reasonable (and probably a good practice) to explicitly require a JAVA_HOME to be set so I'll go with the first of the 2.
asfgit
pushed a commit
that referenced
this pull request
Sep 22, 2017
## 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 <holden@us.ibm.com> Closes #19312 from holdenk/improve-release-scripts-r2. (cherry picked from commit 8f130ad) Signed-off-by: Holden Karau <holden@us.ibm.com>
asfgit
pushed a commit
that referenced
this pull request
Sep 22, 2017
## 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 <holden@us.ibm.com> Closes #19312 from holdenk/improve-release-scripts-r2. (cherry picked from commit 8f130ad) Signed-off-by: Holden Karau <holden@us.ibm.com>
|
Test build #82071 has finished for PR 19312 at commit
|
|
Merged to master, branch-2.2, and branch-2.1. |
MatthewRBruce
pushed a commit
to Shopify/spark
that referenced
this pull request
Jul 31, 2018
## 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 <holden@us.ibm.com> Closes apache#19312 from holdenk/improve-release-scripts-r2. (cherry picked from commit 8f130ad) Signed-off-by: Holden Karau <holden@us.ibm.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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)