From ab7094dc95757a61bc0cb1a3a184105ac620f774 Mon Sep 17 00:00:00 2001 From: Adam Farley Date: Tue, 3 Dec 2024 12:57:28 +0000 Subject: [PATCH] Add potential boot location for jdk10 on orka mac Currently, the JDK10 boot directory in the Orka node template is called jdk-10 instead of the correct jdk10. This change allows us to tolerate this setup until we are able to regenerate the Orka node template. Signed-off-by: Adam Farley --- build-farm/platform-specific-configurations/mac.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build-farm/platform-specific-configurations/mac.sh b/build-farm/platform-specific-configurations/mac.sh index 1bbe897df..2d0f6241c 100755 --- a/build-farm/platform-specific-configurations/mac.sh +++ b/build-farm/platform-specific-configurations/mac.sh @@ -114,6 +114,11 @@ if [ ! -d "$(eval echo "\$$BOOT_JDK_VARIABLE")" ]; then if [ -x "/Library/Java/JavaVirtualMachines/jdk${JDK_BOOT_VERSION}/Contents/Home/bin/javac" ]; then echo "Could not use ${BOOT_JDK_VARIABLE} - using /Library/Java/JavaVirtualMachines/jdk${JDK_BOOT_VERSION}/Contents/Home" export "${BOOT_JDK_VARIABLE}"="/Library/Java/JavaVirtualMachines/jdk${JDK_BOOT_VERSION}/Contents/Home" + elif [ -x "/Library/Java/JavaVirtualMachines/jdk-${JDK_BOOT_VERSION}/Contents/Home/bin/javac" ]; then + # TODO: This temporary ELIF allows us to accomodate undesired dashes that may be present + # in boot directory names (e.g. jdk-10) on Orka node images (fix pending). + echo "Could not use ${BOOT_JDK_VARIABLE} - using /Library/Java/JavaVirtualMachines/jdk-${JDK_BOOT_VERSION}/Contents/Home" + export "${BOOT_JDK_VARIABLE}"="/Library/Java/JavaVirtualMachines/jdk-${JDK_BOOT_VERSION}/Contents/Home" elif [ "$JDK_BOOT_VERSION" -ge 8 ]; then # Adoptium has no build pre-8 mkdir -p "$bootDir" for releaseType in "ga" "ea"