From 51ad053fc6fc90e3fc645831b4347c7e64cb496d Mon Sep 17 00:00:00 2001 From: Adam Farley Date: Mon, 2 Dec 2024 14:46:58 +0000 Subject: [PATCH 1/2] Adding windows aarch64 to the list of platforms to be triaged Signed-off-by: Adam Farley --- tooling/build_autotriage/build_autotriage.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tooling/build_autotriage/build_autotriage.sh b/tooling/build_autotriage/build_autotriage.sh index 27bd40772..5445f050f 100644 --- a/tooling/build_autotriage/build_autotriage.sh +++ b/tooling/build_autotriage/build_autotriage.sh @@ -59,6 +59,7 @@ temurinPlatforms+=("mac-aarch64"); platformStart+=(11); platformEnd+=(9 temurinPlatforms+=("mac-x64"); platformStart+=(8); platformEnd+=(99) temurinPlatforms+=("solaris-sparcv9"); platformStart+=(8); platformEnd+=(8) temurinPlatforms+=("solaris-x64"); platformStart+=(8); platformEnd+=(8) +temurinPlatforms+=("windows-aarch64"); platformStart+=(21); platformEnd+=(99) temurinPlatforms+=("windows-x64"); platformStart+=(8); platformEnd+=(99) temurinPlatforms+=("windows-x86-32"); platformStart+=(8); platformEnd+=(17) From 8a3e71019be2ba5118958a366c00a0d26cee1a58 Mon Sep 17 00:00:00 2001 From: Adam Farley Date: Mon, 2 Dec 2024 16:43:07 +0000 Subject: [PATCH 2/2] Allows us to use the jdk10 boot directory in the wrong directory 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"