specs: Use java_jdk_21 as Linux default jdk #45
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
prenaux
requested changes
Mar 28, 2024
Comment on lines
10
to
36
| NT*) | ||
| export JAVA_HOME="${HAM_TOOLSET_DIR}/nt-x86/" | ||
| if [ ! -e "$JAVA_HOME/bin/java.exe" ] || [ ! -e "$JAVA_HOME/bin/javac.exe" ]; then | ||
| toolset_check_and_dl_ver java_jdk_21 java_jdk_21_nt-x86 v21 | ||
| if [ ! -e "$JAVA_HOME/bin/java.exe" ] || [ ! -e "$JAVA_HOME/bin/javac.exe" ]; then | ||
| echo "E/nt-x86 folder doesn't exist in the toolset" | ||
| return 1 | ||
| fi | ||
| fi | ||
| pathenv_add "${JAVA_HOME}/bin" | ||
| ;; | ||
| OSX) | ||
| if [ "$HAM_BIN_LOA" == "osx-arm64" ]; then | ||
| echo "E/Toolset: Unsupported host OS, no Java 21 for osx-arm64." | ||
| return 1 | ||
| else | ||
| export JAVA_HOME="${HAM_TOOLSET_DIR}/osx-x64/" | ||
| if [ ! -e "$JAVA_HOME/bin/java" ] || [ ! -e "$JAVA_HOME/bin/javac" ]; then | ||
| toolset_check_and_dl_ver java_jdk_21 osx-x64 v21 || return 1 | ||
| if [ ! -e "$JAVA_HOME/bin/java" ] || [ ! -e "$JAVA_HOME/bin/javac" ]; then | ||
| echo "E/osx-x64 can't install Java 21" | ||
| return 1 | ||
| fi | ||
| fi | ||
| pathenv_add "${JAVA_HOME}/bin" | ||
| fi | ||
| ;; |
There was a problem hiding this comment.
We havent uploaded those toolsets so they should say "Unsupported OS." for now. When we upload them we can update these.
prenaux
approved these changes
Mar 28, 2024
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.
As description says
Formal Notes
Description, Motivation and Context
How Has This Been Tested?
Command line to run all the tests that I run locally:
Types Of Changes