Merge branch 'light_brynga/update_java_version' into 'main'

Ensure Java 17 or higher is the active version in dev-setup/setup_macos.sh

See merge request veilid/veilid!320
This commit is contained in:
Christien Rioux 2024-10-20 11:09:41 +00:00
commit 430aa60643

View File

@ -116,12 +116,12 @@ else
exit 1 exit 1
fi fi
# ensure Java 17 is the active version # ensure Java 17 or higher is the active version
JAVA_VERSION=$(java -version 2>&1 | head -n 1 | cut -d\" -f2) JAVA_VERSION=$(java -version 2>&1 | head -n 1 | cut -d\" -f2)
if [ ! -z $(echo $JAVA_VERSION | egrep "^17") ]; then if [[ ! -z $(echo $JAVA_VERSION | egrep "^1[7-9]|^[2-9][0-9]") ]]; then
echo '[X] Java 17 is available in the path' echo '[X] Java 17 or higher is available in the path'
else else
echo 'Java 17 is not available in the path' echo 'Java 17 or higher is not available in the path'
exit 1 exit 1
fi fi