From ef28fe0571e1d9eb1d160acc113650afd9da7820 Mon Sep 17 00:00:00 2001 From: David Li Date: Mon, 14 Apr 2025 14:36:48 +0900 Subject: [PATCH 1/2] MINOR: Don't uninstall Flatbuffers in CI There is no more need after https://github.com/apache/arrow/commit/32641ecfd97e302ea8119b1147d77aced96d097b --- .github/workflows/rc.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index e039306ec3..4beeb8e213 100644 --- a/.github/workflows/rc.yml +++ b/.github/workflows/rc.yml @@ -261,11 +261,6 @@ jobs: # bundled Protobuf. brew uninstall protobuf - # We need Flatbuffers 24, not the latest version - # Homebrew does not offer older versions, so remove the Homebrew - # package and rely on Arrow using a bundled version instead - brew uninstall flatbuffers - brew bundle --file=Brewfile - name: Prepare ccache run: | @@ -281,6 +276,7 @@ jobs: set -e # make brew Java available to CMake export JAVA_HOME=$(brew --prefix openjdk@11)/libexec/openjdk.jdk/Contents/Home + export ARROW_BUILD_TESTS=OFF ci/scripts/jni_macos_build.sh . arrow build jni - name: Compress into single artifact to keep directory structure run: tar -cvzf jni-macos-${{ matrix.platform.arch }}.tar.gz jni/ From a53eeda2ab5bc4e5f1752efd672d7d3e640d57e6 Mon Sep 17 00:00:00 2001 From: David Li Date: Mon, 14 Apr 2025 16:24:04 +0900 Subject: [PATCH 2/2] disable tests by default --- .github/workflows/rc.yml | 1 - ci/scripts/jni_macos_build.sh | 2 +- ci/scripts/jni_manylinux_build.sh | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/rc.yml b/.github/workflows/rc.yml index 4beeb8e213..5b78cc9395 100644 --- a/.github/workflows/rc.yml +++ b/.github/workflows/rc.yml @@ -276,7 +276,6 @@ jobs: set -e # make brew Java available to CMake export JAVA_HOME=$(brew --prefix openjdk@11)/libexec/openjdk.jdk/Contents/Home - export ARROW_BUILD_TESTS=OFF ci/scripts/jni_macos_build.sh . arrow build jni - name: Compress into single artifact to keep directory structure run: tar -cvzf jni-macos-${{ matrix.platform.arch }}.tar.gz jni/ diff --git a/ci/scripts/jni_macos_build.sh b/ci/scripts/jni_macos_build.sh index 65b255e2dc..f7543b6f7a 100755 --- a/ci/scripts/jni_macos_build.sh +++ b/ci/scripts/jni_macos_build.sh @@ -61,7 +61,7 @@ github_actions_group_begin "Building Arrow C++ libraries" install_dir="${build_dir}/cpp-install" : "${ARROW_ACERO:=ON}" export ARROW_ACERO -: "${ARROW_BUILD_TESTS:=ON}" +: "${ARROW_BUILD_TESTS:=OFF}" export ARROW_BUILD_TESTS : "${ARROW_DATASET:=ON}" export ARROW_DATASET diff --git a/ci/scripts/jni_manylinux_build.sh b/ci/scripts/jni_manylinux_build.sh index 148d2e02f6..a34ec0f420 100755 --- a/ci/scripts/jni_manylinux_build.sh +++ b/ci/scripts/jni_manylinux_build.sh @@ -57,7 +57,7 @@ devtoolset_version="$(rpm -qa "devtoolset-*-gcc" --queryformat '%{VERSION}' | gr devtoolset_include_cpp="/opt/rh/devtoolset-${devtoolset_version}/root/usr/include/c++/${devtoolset_version}" : "${ARROW_ACERO:=ON}" export ARROW_ACERO -: "${ARROW_BUILD_TESTS:=ON}" +: "${ARROW_BUILD_TESTS:=OFF}" export ARROW_BUILD_TESTS : "${ARROW_DATASET:=ON}" export ARROW_DATASET