From e0d68b388e421ffe245c13bbf6c1aefa050f6e90 Mon Sep 17 00:00:00 2001 From: Christian Blichmann Date: Tue, 4 Nov 2025 05:22:42 -0800 Subject: [PATCH] Cleanup Kokoro config and build scripts PiperOrigin-RevId: 827922630 Change-Id: Ic2b8805d12a0a8d1aeb0d97fa72cdb4be8142694 --- kokoro/docker/debian10_java11/Dockerfile | 17 ++++++++++------- kokoro/macos/build.sh | 3 +-- kokoro/ubuntu/build.sh | 1 - kokoro/ubuntu/dockerized_build.sh | 1 - kokoro/windows/build.bat | 8 +------- 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/kokoro/docker/debian10_java11/Dockerfile b/kokoro/docker/debian10_java11/Dockerfile index eca446e7..1ca31017 100644 --- a/kokoro/docker/debian10_java11/Dockerfile +++ b/kokoro/docker/debian10_java11/Dockerfile @@ -8,7 +8,7 @@ # If you modify this container, push it to gcr.io and update our Kokoro builds # to reference it. -FROM debian:bookworm +FROM debian:trixie ARG DEBIAN_FRONTEND=noninteractive SHELL ["/bin/bash", "-c"] @@ -42,11 +42,14 @@ ADD third_party /build/src/third_party ARG GHIDRA_INSTALL_DIR=/build/src/third_party/ghidra \ YFILES_DIR=/build/src/third_party/java/yfiles/v2_17 -RUN cd src/third_party/zynamics/binexport/java && \ - gradle && \ - gradle clean && gradle --stop -RUN cd src/third_party/zynamics/bindiff/java && \ +RUN pushd src/third_party/zynamics/binexport/java && \ + (gradle || true) && \ gradle clean && \ - gradle :zylib:build :ui:obfuscatedJar && \ - gradle clean && gradle --stop && \ + popd && \ + pushd src/third_party/zynamics/bindiff/java && \ + (gradle :zylib:build :ui:obfuscatedJar || true) && \ + gradle clean && \ + gradle --stop && \ + popd && \ rm -rf /build/* + diff --git a/kokoro/macos/build.sh b/kokoro/macos/build.sh index 52c118d7..e3af005b 100755 --- a/kokoro/macos/build.sh +++ b/kokoro/macos/build.sh @@ -43,8 +43,7 @@ cmake "${src_dir}/bindiff" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_RULE_MESSAGES=OFF \ "-DCMAKE_INSTALL_PREFIX=${out_dir}" \ - -DBINEXPORT_ENABLE_BINARY_NINJA=OFF \ - "-DBOOST_ROOT=${KOKORO_PIPER_DIR}/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost" \ + -DBINEXPORT_ENABLE_BINARYNINJA=OFF \ "-DIdaSdk_ROOT_DIR=${KOKORO_PIPER_DIR}/google3/third_party/idasdk" cmake --build . --config Release -- "-j$(sysctl -n hw.logicalcpu)" ctest --build-config Release --output-on-failure -R '^[A-Z]' diff --git a/kokoro/ubuntu/build.sh b/kokoro/ubuntu/build.sh index 74ec48ac..139ea714 100755 --- a/kokoro/ubuntu/build.sh +++ b/kokoro/ubuntu/build.sh @@ -23,7 +23,6 @@ docker run \ -e "KOKORO_PIPER_CHANGELIST=${KOKORO_PIPER_CHANGELIST}" \ -v "${KOKORO_ARTIFACTS_DIR}/git/binexport":/build/deps/binexport \ -v "${KOKORO_PIPER_DIR}/google3/third_party/idasdk":/build/deps/idasdk \ - -v "${KOKORO_PIPER_DIR}/google3/third_party/boost/do_not_include_from_google3_only_third_party/boost":/build/deps/boost \ -v "${KOKORO_ARTIFACTS_DIR}/git/absl":/build/out/_deps/absl-src \ -v "${KOKORO_ARTIFACTS_DIR}/git/googletest":/build/out/_deps/googletest-src \ -v "${KOKORO_ARTIFACTS_DIR}/git/protobuf":/build/out/_deps/protobuf-src \ diff --git a/kokoro/ubuntu/dockerized_build.sh b/kokoro/ubuntu/dockerized_build.sh index d0aafb54..1656d970 100755 --- a/kokoro/ubuntu/dockerized_build.sh +++ b/kokoro/ubuntu/dockerized_build.sh @@ -15,7 +15,6 @@ cmake "${src_dir}/bindiff/" \ -DFETCHCONTENT_FULLY_DISCONNECTED=ON \ -DCMAKE_BUILD_TYPE=Release \ "-DCMAKE_INSTALL_PREFIX=${out_dir}" \ - "-DBOOST_ROOT=${deps_dir}/boost" \ "-DIdaSdk_ROOT_DIR=${deps_dir}/idasdk" cmake --build . --config Release ctest --build-config Release --output-on-failure -R '^[A-Z]' diff --git a/kokoro/windows/build.bat b/kokoro/windows/build.bat index 3b17346b..8d57fc4e 100644 --- a/kokoro/windows/build.bat +++ b/kokoro/windows/build.bat @@ -15,11 +15,6 @@ set SRC_DIR=%KOKORO_ARTIFACTS_DIR%/git set OUT_DIR=%BUILD_DIR% set DEPS_DIR=%BUILD_DIR% -:: Copy extra Binary Ninja API dependency -xcopy /q /s /e ^ - "%KOKORO_PIPER_DIR%\google3\third_party\jsoncpp" ^ - "%KOKORO_PIPER_DIR%\google3\third_party\binaryninja_api\third_party\jsoncpp\" - :: Set up Visual Studio call C:\VS\VC\Auxiliary\Build\vcvarsall.bat x64 @@ -30,11 +25,10 @@ cmake "%SRC_DIR%/bindiff" ^ "-DFETCHCONTENT_SOURCE_DIR_ABSL=%KOKORO_ARTIFACTS_DIR%\git\absl" ^ "-DFETCHCONTENT_SOURCE_DIR_GOOGLETEST=%KOKORO_ARTIFACTS_DIR%\git\googletest" ^ "-DFETCHCONTENT_SOURCE_DIR_PROTOBUF=%KOKORO_ARTIFACTS_DIR%\git\protobuf" ^ - "-DFETCHCONTENT_SOURCE_DIR_BINARYNINJAAPI=%KOKORO_PIPER_DIR%\google3\third_party\binaryninja_api" ^ "-DFETCHCONTENT_SOURCE_DIR_SQLITE=%KOKORO_PIPER_DIR%\google3\third_party\sqlite\src" ^ -DCMAKE_BUILD_TYPE=Release ^ "-DCMAKE_INSTALL_PREFIX=%OUT_DIR%" ^ - "-DBOOST_ROOT=%KOKORO_PIPER_DIR%\google3\third_party\boost\do_not_include_from_google3_only_third_party\boost" ^ + -DBINEXPORT_ENABLE_BINARYNINJA=OFF ^ "-DIdaSdk_ROOT_DIR=%KOKORO_PIPER_DIR%\google3\third_party\idasdk" ^ -DBUILD_TESTING=OFF || exit /b cmake --build . --config Release || exit /b