Skip to content

Commit 6ea8908

Browse files
committed
Use openjdk 21
1 parent df959ea commit 6ea8908

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

buildscripts/kokoro/windows32.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ set JAVA_HOME=
1818

1919
mkdir grpc-java-helper32
2020
cd grpc-java-helper32
21-
call "%VS170COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvars32.bat" || exit /b 1
21+
call "%VS140COMNTOOLS%\vsvars32.bat" || exit /b 1
2222
call "%WORKSPACE%\buildscripts\make_dependencies.bat" || exit /b 1
2323

2424
cd "%WORKSPACE%"

buildscripts/kokoro/windows64.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set JAVA_HOME=
1717

1818
mkdir grpc-java-helper64
1919
cd grpc-java-helper64
20-
call "%VS170COMNTOOLS%\..\..\VC\Auxiliary\Build\vcvars64.bat" || exit /b 1
20+
call "%VS140COMNTOOLS%\vsvars64.bat" || exit /b 1
2121
call "%WORKSPACE%\buildscripts\make_dependencies.bat" || exit /b 1
2222

2323
cd "%WORKSPACE%"

buildscripts/make_dependencies.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
echo on
22
@rem set PROTOBUF_VER=21.7
33
choco install -y gradle git curl pkgconfiglite
4-
choco install -y openjdk --version=22.0.2
5-
set PATH=%PATH%;"c:\Program Files\OpenJDK\jdk-22.0.2\bin"
4+
choco install -y openjdk --version=21.0
5+
set PATH=%PATH%;"c:\Program Files\OpenJDK\jdk-21\bin"
66
set JAVA_HOME=
77
set PROTOBUF_VER=22.5
88
set ABSL_VERSION=20230125.4

0 commit comments

Comments
 (0)