Skip to content

Commit fc42141

Browse files
committed
Use --preset
1 parent 408a9da commit fc42141

2 files changed

Lines changed: 4 additions & 132 deletions

File tree

ci/scripts/jni_macos_build.sh

Lines changed: 2 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,6 @@ fi
5959

6060
github_actions_group_begin "Building Arrow C++ libraries"
6161
install_dir="${build_dir}/cpp-install"
62-
: "${ARROW_ACERO:=ON}"
63-
export ARROW_ACERO
64-
: "${ARROW_BUILD_TESTS:=OFF}"
65-
export ARROW_BUILD_TESTS
66-
: "${ARROW_DATASET:=ON}"
67-
export ARROW_DATASET
68-
: "${ARROW_GANDIVA:=ON}"
69-
export ARROW_GANDIVA
70-
: "${ARROW_ORC:=ON}"
71-
export ARROW_ORC
72-
: "${ARROW_PARQUET:=ON}"
73-
: "${ARROW_S3:=ON}"
74-
: "${CMAKE_BUILD_TYPE:=Release}"
7562
: "${CMAKE_UNITY_BUILD:=ON}"
7663

7764
export ARROW_TEST_DATA="${arrow_dir}/testing/data"
@@ -81,50 +68,11 @@ export AWS_EC2_METADATA_DISABLED=TRUE
8168
cmake \
8269
-S "${arrow_dir}/cpp" \
8370
-B "${build_dir}/cpp" \
84-
-DARROW_ACERO="${ARROW_ACERO}" \
85-
-DARROW_BUILD_SHARED=OFF \
86-
-DARROW_BUILD_TESTS="${ARROW_BUILD_TESTS}" \
87-
-DARROW_CSV="${ARROW_DATASET}" \
88-
-DARROW_DATASET="${ARROW_DATASET}" \
89-
-DARROW_SUBSTRAIT="${ARROW_DATASET}" \
90-
-DARROW_DEPENDENCY_USE_SHARED=OFF \
91-
-DARROW_GANDIVA="${ARROW_GANDIVA}" \
92-
-DARROW_GANDIVA_STATIC_LIBSTDCPP=ON \
93-
-DARROW_JSON="${ARROW_DATASET}" \
94-
-DARROW_ORC="${ARROW_ORC}" \
95-
-DARROW_PARQUET="${ARROW_PARQUET}" \
96-
-DARROW_S3="${ARROW_S3}" \
97-
-DARROW_USE_CCACHE="${ARROW_USE_CCACHE}" \
98-
-DAWSSDK_SOURCE=BUNDLED \
99-
-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
100-
-DCMAKE_INSTALL_PREFIX="${install_dir}" \
101-
-DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD}" \
102-
-DGTest_SOURCE=BUNDLED \
103-
-DPARQUET_BUILD_EXAMPLES=OFF \
104-
-DPARQUET_BUILD_EXECUTABLES=OFF \
105-
-DPARQUET_REQUIRE_ENCRYPTION=OFF \
106-
-Dre2_SOURCE=BUNDLED \
107-
-GNinja
71+
--preset=ninja-release-jni-macos \
72+
-DCMAKE_INSTALL_PREFIX="${install_dir}"
10873
cmake --build "${build_dir}/cpp" --target install
10974
github_actions_group_end
11075

111-
if [ "${ARROW_RUN_TESTS:-}" == "ON" ]; then
112-
github_actions_group_begin "Running Arrow C++ libraries tests"
113-
# MinIO is required
114-
exclude_tests="arrow-s3fs-test"
115-
# unstable
116-
exclude_tests="${exclude_tests}|arrow-acero-asof-join-node-test"
117-
exclude_tests="${exclude_tests}|arrow-acero-hash-join-node-test"
118-
ctest \
119-
--exclude-regex "${exclude_tests}" \
120-
--label-regex unittest \
121-
--output-on-failure \
122-
--parallel "$(sysctl -n hw.ncpu)" \
123-
--test-dir "${build_dir}/cpp" \
124-
--timeout 300
125-
github_actions_group_end
126-
fi
127-
12876
export JAVA_JNI_CMAKE_ARGS="-DProtobuf_ROOT=${build_dir}/cpp/protobuf_ep-install"
12977
"${source_dir}/ci/scripts/jni_build.sh" \
13078
"${source_dir}" \

ci/scripts/jni_manylinux_build.sh

Lines changed: 2 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -53,24 +53,6 @@ if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
5353
fi
5454

5555
github_actions_group_begin "Building Arrow C++ libraries"
56-
: "${ARROW_ACERO:=ON}"
57-
export ARROW_ACERO
58-
: "${ARROW_BUILD_TESTS:=OFF}"
59-
export ARROW_BUILD_TESTS
60-
: "${ARROW_DATASET:=ON}"
61-
export ARROW_DATASET
62-
: "${ARROW_GANDIVA:=ON}"
63-
export ARROW_GANDIVA
64-
: "${ARROW_GCS:=ON}"
65-
: "${ARROW_JEMALLOC:=OFF}"
66-
: "${ARROW_MIMALLOC:=ON}"
67-
: "${ARROW_RPATH_ORIGIN:=ON}"
68-
: "${ARROW_ORC:=ON}"
69-
export ARROW_ORC
70-
: "${ARROW_PARQUET:=ON}"
71-
: "${ARROW_S3:=ON}"
72-
: "${CMAKE_BUILD_TYPE:=release}"
73-
: "${CMAKE_UNITY_BUILD:=ON}"
7456
: "${VCPKG_ROOT:=/opt/vcpkg}"
7557
: "${VCPKG_FEATURE_FLAGS:=-manifests}"
7658
: "${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}}"
@@ -83,70 +65,12 @@ install_dir="${build_dir}/cpp-install"
8365
cmake \
8466
-S "${arrow_dir}/cpp" \
8567
-B "${build_dir}/cpp" \
86-
-DARROW_ACERO="${ARROW_ACERO}" \
87-
-DARROW_BUILD_SHARED=OFF \
88-
-DARROW_BUILD_TESTS="${ARROW_BUILD_TESTS}" \
89-
-DARROW_CSV="${ARROW_DATASET}" \
90-
-DARROW_DATASET="${ARROW_DATASET}" \
91-
-DARROW_SUBSTRAIT="${ARROW_DATASET}" \
92-
-DARROW_DEPENDENCY_SOURCE="VCPKG" \
93-
-DARROW_DEPENDENCY_USE_SHARED=OFF \
94-
-DARROW_GANDIVA="${ARROW_GANDIVA}" \
95-
-DARROW_GCS="${ARROW_GCS}" \
96-
-DARROW_JEMALLOC="${ARROW_JEMALLOC}" \
97-
-DARROW_JSON="${ARROW_DATASET}" \
98-
-DARROW_MIMALLOC="${ARROW_MIMALLOC}" \
99-
-DARROW_ORC="${ARROW_ORC}" \
100-
-DARROW_PARQUET="${ARROW_PARQUET}" \
101-
-DARROW_RPATH_ORIGIN="${ARROW_RPATH_ORIGIN}" \
102-
-DARROW_S3="${ARROW_S3}" \
103-
-DARROW_USE_CCACHE="${ARROW_USE_CCACHE}" \
104-
-DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE}" \
105-
-DCMAKE_INSTALL_PREFIX="${install_dir}" \
106-
-DCMAKE_UNITY_BUILD="${CMAKE_UNITY_BUILD}" \
107-
-DGTest_SOURCE=BUNDLED \
108-
-DORC_SOURCE=BUNDLED \
109-
-DORC_PROTOBUF_EXECUTABLE="${VCPKG_ROOT}/installed/${VCPKG_TARGET_TRIPLET}/tools/protobuf/protoc" \
110-
-DPARQUET_BUILD_EXAMPLES=OFF \
111-
-DPARQUET_BUILD_EXECUTABLES=OFF \
112-
-DPARQUET_REQUIRE_ENCRYPTION=OFF \
113-
-DVCPKG_MANIFEST_MODE=OFF \
114-
-DVCPKG_TARGET_TRIPLET="${VCPKG_TARGET_TRIPLET}" \
115-
-GNinja
68+
--preset=ninja-release-jni-linux \
69+
-DCMAKE_INSTALL_PREFIX="${install_dir}"
11670
cmake --build "${build_dir}/cpp"
11771
cmake --install "${build_dir}/cpp"
11872
github_actions_group_end
11973

120-
if [ "${ARROW_RUN_TESTS:-OFF}" = "ON" ]; then
121-
github_actions_group_begin "Running Arrow C++ libraries tests"
122-
# MinIO is required
123-
exclude_tests="arrow-s3fs-test"
124-
case $(arch) in
125-
aarch64)
126-
# GCS testbench is crashed on aarch64:
127-
# ImportError: ../grpc/_cython/cygrpc.cpython-38-aarch64-linux-gnu.so:
128-
# undefined symbol: vtable for std::__cxx11::basic_ostringstream<
129-
# char, std::char_traits<char>, std::allocator<char> >
130-
exclude_tests="${exclude_tests}|arrow-gcsfs-test"
131-
;;
132-
esac
133-
# unstable
134-
exclude_tests="${exclude_tests}|arrow-acero-asof-join-node-test"
135-
exclude_tests="${exclude_tests}|arrow-acero-hash-join-node-test"
136-
# external dependency
137-
exclude_tests="${exclude_tests}|arrow-gcsfs-test"
138-
# strptime
139-
exclude_tests="${exclude_tests}|arrow-utility-test"
140-
ctest \
141-
--exclude-regex "${exclude_tests}" \
142-
--label-regex unittest \
143-
--output-on-failure \
144-
--parallel "$(nproc)" \
145-
--test-dir "${build_dir}/cpp" \
146-
--timeout 300
147-
github_actions_group_end
148-
fi
149-
15074
JAVA_JNI_CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
15175
JAVA_JNI_CMAKE_ARGS="${JAVA_JNI_CMAKE_ARGS} -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}"
15276
export JAVA_JNI_CMAKE_ARGS

0 commit comments

Comments
 (0)