buildscripts: Use Java 11 on Windows CI

This version of Java is old, but not as old as the Java 8 version.
This commit is contained in:
Eric Anderson 2024-02-20 15:21:47 -08:00
parent bfc0f959cd
commit c7e87d2180
3 changed files with 2 additions and 6 deletions

View File

@ -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

View File

@ -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

View File

@ -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