Skip to content

DO NOT MERGE: try to fix macOS CI #1264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lidavidm wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

DO NOT MERGE: try to fix macOS CI #1264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ci/scripts/jni_macos_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,19 @@ cmake \
cmake --build "${build_dir}/cpp" --target install
github_actions_group_end

absl_build_dir="${build_dir}/cpp/_deps/absl-build"
if [ -d "${absl_build_dir}" ]; then
github_actions_group_begin "Installing bundled Abseil"
cmake --install "${absl_build_dir}" --prefix "${install_dir}" --config Release
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"
absl_cmake_dir="${install_dir}/lib/cmake/absl"
if [ -d "${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}" \
Expand Down
Loading