Skip to content

Commit a2fd8dc

Browse files
committed
Fix open jdk version to 11.0 as 11.0.27 is not available.
1 parent 3b97cc8 commit a2fd8dc

File tree

2 files changed

+1
-12
lines changed

2 files changed

+1
-12
lines changed

buildscripts/make_dependencies.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
echo on
22
@rem set PROTOBUF_VER=21.7
33
choco install -y gradle git curl pkgconfiglite
4-
choco install -y openjdk --version=11.0.27
4+
choco install -y openjdk --version=11.0
55
set JAVA_HOME="c:\Program Files\OpenJDK\jdk-21"
66
set PATH=%PATH%;"c:\Program Files\OpenJDK\jdk-21\bin"
77
set PROTOBUF_VER=22.5

buildscripts/make_dependencies.sh

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,6 @@ if [ -f ${INSTALL_DIR}/bin/protoc ]; then
3030
echo "Not building protobuf. Already built"
3131
# TODO(ejona): swap to `brew install --devel protobuf` once it is up-to-date
3232
else
33-
if [[ ! -d "cmake-${CMAKE_VERSION}" ]]; then
34-
curl -Ls "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/cmake-${CMAKE_VERSION}.tar.gz" | tar xz
35-
fi
36-
# the same source dir is used for 32 and 64 bit builds, so we need to clean stale data first
37-
rm -rf "$DOWNLOAD_DIR/cmake-${CMAKE_VERSION}/bin"
38-
cd "$DOWNLOAD_DIR/cmake-${CMAKE_VERSION}"
39-
./bootstrap
40-
make
41-
make install
42-
ln -s /usr/local/bin/cmake /usr/bin/cmake
43-
cd "$DOWNLOAD_DIR"
4433
if [[ ! -d "protobuf-${PROTOBUF_VERSION}" ]]; then
4534
curl -Ls "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.tar.gz" | tar xz
4635
curl -Ls "https://github.com/abseil/abseil-cpp/archive/refs/tags/${ABSL_VERSION}.tar.gz" | tar xz

0 commit comments

Comments
 (0)