From c7e87d2180aedd915a115cbe04b95e8ab1db0fc1 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Tue, 20 Feb 2024 15:21:47 -0800 Subject: [PATCH] buildscripts: Use Java 11 on Windows CI This version of Java is old, but not as old as the Java 8 version. --- buildscripts/kokoro/windows.bat | 4 ---- buildscripts/kokoro/windows32.bat | 2 +- buildscripts/kokoro/windows64.bat | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/buildscripts/kokoro/windows.bat b/buildscripts/kokoro/windows.bat index 7b017d5cdb..b5852cdd97 100644 --- a/buildscripts/kokoro/windows.bat +++ b/buildscripts/kokoro/windows.bat @@ -15,10 +15,6 @@ set ESCWORKSPACE=%WORKSPACE:\=\\% rename "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" vswhere-disabled.exe -@rem Clear JAVA_HOME to prevent a different Java version from being used -set JAVA_HOME= -set PATH=C:\Program Files\java\jdk1.8.0_152\bin;%PATH% - cmd.exe /C "%WORKSPACE%\buildscripts\kokoro\windows32.bat" || exit /b 1 cmd.exe /C "%WORKSPACE%\buildscripts\kokoro\windows64.bat" || exit /b 1 diff --git a/buildscripts/kokoro/windows32.bat b/buildscripts/kokoro/windows32.bat index 7c6491cf97..ffd4d3b99a 100644 --- a/buildscripts/kokoro/windows32.bat +++ b/buildscripts/kokoro/windows32.bat @@ -15,7 +15,7 @@ set ESCWORKSPACE=%WORKSPACE:\=\\% @rem Clear JAVA_HOME to prevent a different Java version from being used set JAVA_HOME= -set PATH=C:\Program Files\java\jdk1.8.0_152\bin;%PATH% +set PATH=C:\Program Files\OpenJDK\openjdk-11.0.12_7\bin;%PATH% mkdir grpc-java-helper32 cd grpc-java-helper32 diff --git a/buildscripts/kokoro/windows64.bat b/buildscripts/kokoro/windows64.bat index cf02336be3..8542f1c053 100644 --- a/buildscripts/kokoro/windows64.bat +++ b/buildscripts/kokoro/windows64.bat @@ -14,7 +14,7 @@ set ESCWORKSPACE=%WORKSPACE:\=\\% @rem Clear JAVA_HOME to prevent a different Java version from being used set JAVA_HOME= -set PATH=C:\Program Files\java\jdk1.8.0_152\bin;%PATH% +set PATH=C:\Program Files\OpenJDK\openjdk-11.0.12_7\bin;%PATH% mkdir grpc-java-helper64 cd grpc-java-helper64