From fe81a623a4719eea9f51b33c5b598f776cd4c97b Mon Sep 17 00:00:00 2001 From: David Li Date: Thu, 20 Aug 2026 20:50:52 +0900 Subject: [PATCH] DO NOT MERGE: try to fix macOS CI Assisted-by: GPT-5.6 Sol --- ci/scripts/jni_macos_build.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/ci/scripts/jni_macos_build.sh b/ci/scripts/jni_macos_build.sh index 65ab450666..52faa605b3 100755 --- a/ci/scripts/jni_macos_build.sh +++ b/ci/scripts/jni_macos_build.sh @@ -77,8 +77,25 @@ cmake \ cmake --build "${build_dir}/cpp" --target install github_actions_group_end +absl_build_dir="${build_dir}/cpp/_deps/absl-build" +absl_cmake_dir="" +if [ -d "${absl_build_dir}" ]; then + github_actions_group_begin "Installing bundled Abseil" + cmake --build "${build_dir}/cpp" --target _deps/absl-build/all --config Release + cmake --install "${absl_build_dir}" --prefix "${install_dir}" --config Release + absl_cmake_dir="${install_dir}/lib/cmake/absl" + if [ ! -f "${absl_cmake_dir}/abslConfig.cmake" ]; then + echo "Bundled Abseil CMake package was not installed in ${absl_cmake_dir}" >&2 + exit 1 + fi + github_actions_group_end +fi + JAVA_JNI_CMAKE_ARGS="-DProtobuf_ROOT=${build_dir}/cpp/_deps/protobuf-build" JAVA_JNI_CMAKE_ARGS+=" -DProtobuf_SRC_ROOT_FOLDER=${build_dir}/cpp/_deps/protobuf-src" +if [ -n "${absl_cmake_dir}" ]; then + JAVA_JNI_CMAKE_ARGS+=" -Dabsl_DIR=${absl_cmake_dir}" +fi export JAVA_JNI_CMAKE_ARGS "${source_dir}/ci/scripts/jni_build.sh" \ "${source_dir}" \