diff --git a/.github/workflows/build_or_publish.yml b/.github/workflows/build_or_publish.yml index 0150571df..f700abc9a 100644 --- a/.github/workflows/build_or_publish.yml +++ b/.github/workflows/build_or_publish.yml @@ -21,7 +21,7 @@ jobs: msvc_arch: amd64_arm64 extra_java: 17 vendor: zulu - args: -DtargetArch=arm64 -DtargetJavaHomeVar=JAVA_HOME_17_ARM64 + args: -DtargetArch=arm64 -DtargetJavaHome="$JAVA_HOME_17_ARM64" - os: macos-13 arch: x64 args: -Dtarget.java.home="$JAVA_HOME_8_X64" diff --git a/gradle/windows.gradle b/gradle/windows.gradle index f22c3dba1..737cecd4f 100644 --- a/gradle/windows.gradle +++ b/gradle/windows.gradle @@ -5,10 +5,10 @@ def target_arch = getArch(System.getProperty("targetArch", os_arch)) def java_home = System.getProperty("java.home") -def alternative_java_home = System.getProperty("targetJavaHomeVar") +def alternative_java_home = System.getProperty("targetJavaHome") if (alternative_java_home != null && alternative_java_home != "") { - java_home = ENV[alternative_java_home] + java_home = alternative_java_home } def sdkhome = ENV.VCToolsInstallDir ? ENV.VCToolsInstallDir : ENV.MSVC