Skip to content

MINOR: [CI] Fix RC JNI builds on Windows (ArrowS3 link) and macOS (runner) #1315

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 5 commits into from
Oct 1, 2026
+10 −1
Merged

MINOR: [CI] Fix RC JNI builds on Windows (ArrowS3 link) and macOS (runner) #1315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5ec26e
Dummy commit to test CI
jbonofre Sep 30, 2026
ec3613e
Link ArrowS3 into dataset JNI library when available
jbonofre Oct 1, 2026
df99570
Use macos-15 runner for JNI macOS build to get prebuilt LLVM bottle
jbonofre Oct 1, 2026
c6506d1
Use bundled uriparser for JNI macOS build
jbonofre Oct 1, 2026
2a465b9
Require ArrowS3 for Arrow C++ >= 26.0.0
jbonofre Oct 1, 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
2 changes: 1 addition & 1 deletion .github/workflows/rc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ jobs:
fail-fast: false
matrix:
platform:
- { runs_on: macos-14, arch: "aarch_64" }
- { runs_on: macos-15, arch: "aarch_64" }
env:
MACOSX_DEPLOYMENT_TARGET: "14.0"
steps:
Expand Down
1 change: 1 addition & 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 @@ -75,6 +75,7 @@ cmake \
--preset=ninja-release-jni-macos \
-Dabsl_SOURCE=BUNDLED \
-Dsimdjson_SOURCE=BUNDLED \
-Duriparser_SOURCE=BUNDLED \
-DCMAKE_INSTALL_PREFIX="${install_dir}"
cmake --build "${build_dir}/cpp" --target install
github_actions_group_end
Expand Down
8 changes: 8 additions & 0 deletions dataset/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@

find_package(ArrowDataset REQUIRED)
find_package(ArrowSubstrait REQUIRED)
# S3 support lives in its own library since Arrow C++ 26.0.0 (apache/arrow GH-50194).
# Older versions bundle it into libarrow and don't provide the ArrowS3 package.
if(ARROW_VERSION VERSION_GREATER_EQUAL 26.0.0)
find_package(ArrowS3 REQUIRED)
endif()

include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${JNI_INCLUDE_DIRS} ${JNI_HEADERS_DIR})
Expand All @@ -39,6 +44,9 @@ target_link_libraries(arrow_java_jni_dataset
jni
ArrowDataset::arrow_dataset_static
ArrowSubstrait::arrow_substrait_static)
if(ArrowS3_FOUND)
target_link_libraries(arrow_java_jni_dataset ArrowS3::arrow_s3_static)
endif()

if(BUILD_TESTING)
add_executable(arrow-java-jni-dataset-test src/main/cpp/jni_util_test.cc
Expand Down
Loading