Skip to content

Commit 3e7930d

Browse files
committed
Add missing ccache related configurations
1 parent 31a65eb commit 3e7930d

3 files changed

Lines changed: 17 additions & 1 deletion

File tree

‎ci/scripts/java_jni_macos_build.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ cmake \
8282
-DARROW_S3=${ARROW_S3} \
8383
-DARROW_SNAPPY_USE_SHARED=OFF \
8484
-DARROW_THRIFT_USE_SHARED=OFF \
85+
-DARROW_USE_CCACHE=${ARROW_USE_CCACHE} \
8586
-DARROW_UTF8PROC_USE_SHARED=OFF \
8687
-DARROW_ZSTD_USE_SHARED=OFF \
8788
-DAWSSDK_SOURCE=BUNDLED \

‎ci/scripts/java_jni_manylinux_build.sh‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ echo "=== Building Arrow C++ libraries ==="
3232
devtoolset_version=$(rpm -qa "devtoolset-*-gcc" --queryformat %{VERSION} | \
3333
grep -o "^[0-9]*")
3434
devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/include/c++/${devtoolset_version}"
35+
: ${ARROW_BUILD_TESTS:=OFF}
3536
: ${ARROW_DATASET:=ON}
3637
: ${ARROW_GANDIVA:=ON}
3738
: ${ARROW_GANDIVA_JAVA:=ON}
@@ -44,14 +45,19 @@ devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/includ
4445
: ${ARROW_PLASMA_JAVA_CLIENT:=ON}
4546
: ${ARROW_PYTHON:=OFF}
4647
: ${ARROW_S3:=ON}
47-
: ${ARROW_BUILD_TESTS:=OFF}
48+
: ${ARROW_USE_CCACHE:=OFF}
4849
: ${CMAKE_BUILD_TYPE:=Release}
4950
: ${CMAKE_UNITY_BUILD:=ON}
5051
: ${VCPKG_ROOT:=/opt/vcpkg}
5152
: ${VCPKG_FEATURE_FLAGS:=-manifests}
5253
: ${VCPKG_TARGET_TRIPLET:=${VCPKG_DEFAULT_TRIPLET:-x64-linux-static-${CMAKE_BUILD_TYPE}}}
5354
: ${GANDIVA_CXX_FLAGS:=-isystem;${devtoolset_include_cpp};-isystem;${devtoolset_include_cpp}/x86_64-redhat-linux;-isystem;-lpthread}
5455

56+
if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
57+
echo "=== ccache statistics before build ==="
58+
ccache -s
59+
fi
60+
5561
export ARROW_TEST_DATA="${arrow_dir}/testing/data"
5662
export PARQUET_TEST_DATA="${arrow_dir}/cpp/submodules/parquet-testing/data"
5763
export AWS_EC2_METADATA_DISABLED=TRUE
@@ -87,6 +93,7 @@ cmake \
8793
-DARROW_S3=${ARROW_S3} \
8894
-DARROW_SNAPPY_USE_SHARED=OFF \
8995
-DARROW_THRIFT_USE_SHARED=OFF \
96+
-DARROW_USE_CCACHE=${ARROW_USE_CCACHE} \
9097
-DARROW_UTF8PROC_USE_SHARED=OFF \
9198
-DARROW_ZSTD_USE_SHARED=OFF \
9299
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
@@ -126,6 +133,11 @@ ${arrow_dir}/ci/scripts/java_jni_build.sh \
126133
${build_dir} \
127134
${dist_dir}
128135

136+
if [ "${ARROW_USE_CCACHE}" == "ON" ]; then
137+
echo "=== ccache statistics after build ==="
138+
ccache -s
139+
fi
140+
129141

130142
echo "=== Copying libraries to the distribution folder ==="
131143
cp -L ${ARROW_HOME}/lib/libarrow_dataset_jni.so ${dist_dir}

‎dev/tasks/java-jars/github.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ jobs:
6565
# aws-sdk-cpp and bundled aws-sdk-cpp. We uninstall Homebrew's
6666
# aws-sdk-cpp to ensure using only bundled aws-sdk-cpp.
6767
brew uninstall aws-sdk-cpp
68+
- name: Setup ccache
69+
run: |
70+
arrow/ci/scripts/ccache_setup.sh
6871
- name: Build C++ Libs
6972
run: |
7073
set -e

0 commit comments

Comments
 (0)