Allow to install Presto RPM with Java 11 #2057
Merged
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
|
With #2064 we could easily test this using a different Docker image that contains Java 11 |
sopel39
reviewed
Nov 19, 2019
| @@ -22,7 +22,11 @@ check_if_correct_java_version() { | |||
| # candidate for JAVA_HOME). | |||
| JAVA_VERSION=$(java_version "$1") | |||
| JAVA_UPDATE=$(echo $JAVA_VERSION | cut -d'_' -f2) | |||
| if [[ ("$JAVA_VERSION" > "1.8") && ($JAVA_UPDATE -ge 161) ]]; then | |||
| JAVA_MAJOR=$(echo $JAVA_VERSION | cut -d'.' -f1) | |||
| if [[ ("$JAVA_MAJOR" -ge "11") ]]; then | |||
There was a problem hiding this comment.
what about other versions? Can we make the mechanism generic?
There was a problem hiding this comment.
This is quite generic for example 12 > 11. However then env variable JAVA11_HOME has unfortunate name.
| if [[ ("$JAVA_MAJOR" -ge "11") ]]; then | ||
| echo "JAVA11_HOME=$1" > /tmp/presto_env.sh | ||
| return 0 | ||
| elif [[ ("$JAVA_VERSION" > "1.8") && ($JAVA_UPDATE -ge 161) ]]; then | ||
| echo "JAVA8_HOME=$1" > /tmp/presto_env.sh |
There was a problem hiding this comment.
shouldn't we make this generic instead?
|
#2064 is merged, so please try adding a test for this in |
kokosing
force-pushed
the
origin/master/188_rpm
branch
2 times, most recently
from
d72397a
to
af0931e
Compare
|
Locally: |
|
Depends on trinodb/docker-images#41 |
electrum
approved these changes
Nov 21, 2019
electrum
reviewed
Nov 21, 2019
| @@ -40,6 +44,7 @@ if ! check_if_correct_java_version "$JAVA8_HOME" && ! check_if_correct_java_vers | |||
| /usr/java/jdk1.8* \ | |||
| /usr/java/jre1.8* \ | |||
| /usr/jdk64/jdk1.8* \ | |||
| /usr/lib/jvm/java-11-* \ | |||
There was a problem hiding this comment.
Should we put this first in the list so that it's found first?
kokosing
force-pushed
the
origin/master/188_rpm
branch
from
af0931e
to
52e347b
Compare
Merged
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.
Allow to install Presto RPM with Java 11