Skip to content

GH-951: Fix CI completely, especially JNI on Windows 2022 and MacOS platforms #925

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

Merged
jbonofre merged 7 commits into from
Jan 8, 2026
Merged

GH-951: Fix CI completely, especially JNI on Windows 2022 and MacOS platforms #925

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
59393f6
Just an empty commit to trigger the CI
jbonofre Dec 2, 2025
50bb45f
Use protoc only for Gandiva JNI (not Gandiva itself)
jbonofre Jan 6, 2026
276f5f3
Use kou/arrow repository for Windows JNI
jbonofre Jan 6, 2026
95215a5
Revert "Use kou/arrow repository for Windows JNI"
jbonofre Jan 7, 2026
f52976e
Update the right bundled protobuf directory
jbonofre Jan 7, 2026
da7bfcb
Re-add protobuf linkage
jbonofre Jan 8, 2026
2468e51
Add Protobuf src root folder in JNI CMake arguments
jbonofre Jan 8, 2026
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
5 changes: 0 additions & 5 deletions .github/workflows/rc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,11 +259,6 @@ jobs:
brew uninstall grpc || : # gRPC depends on RE2
brew uninstall grpc@1.54 || : # gRPC 1.54 may be installed too
brew uninstall re2
# We want to use bundled Protobuf for static linking. If
# Homebrew's Protobuf is installed, its library file may be
# used on test We uninstall Homebrew's Protobuf to ensure using
# bundled Protobuf.
brew uninstall protobuf

brew bundle --file=Brewfile
- name: Prepare ccache
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/jni_macos_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ cmake \
cmake --build "${build_dir}/cpp" --target install
github_actions_group_end

export JAVA_JNI_CMAKE_ARGS="-DProtobuf_ROOT=${build_dir}/cpp/protobuf_ep-install"
export JAVA_JNI_CMAKE_ARGS="-DProtobuf_ROOT=${build_dir}/cpp/_deps/protobuf-build"
"${source_dir}/ci/scripts/jni_build.sh" \
"${source_dir}" \
"${install_dir}" \
Expand Down
1 change: 0 additions & 1 deletion gandiva/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ set_property(TARGET arrow_java_jni_gandiva PROPERTY OUTPUT_NAME "gandiva_jni")
target_link_libraries(arrow_java_jni_gandiva
arrow_java_jni_gandiva_headers
jni
protobuf::libprotobuf
Gandiva::gandiva_static)

# Localize thirdparty symbols using a linker version script. This hides them
Expand Down
Loading