Skip to content
Merged

Fix CI #1913

Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 3 deletions recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ cmake -G "Ninja" ^
-DBUILD_SHARED_LIBS=ON ^
-DBoost_NO_BOOST_CMAKE=ON ^
-DCMAKE_BUILD_TYPE=release ^
-DCMAKE_CXX_STANDARD=17 ^
-DCMAKE_CXX_STANDARD=20 ^
-DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON ^
-DCMAKE_UNITY_BUILD=OFF ^
Expand All @@ -80,8 +80,7 @@ if "%cuda_compiler_version%"=="None" (
npm install -g azurite
set ARROW_TEST_DATA=%SRC_DIR%\testing\data
set PARQUET_TEST_DATA=%SRC_DIR%\cpp\submodules\parquet-testing\data
ctest --progress --output-on-failure
if %ERRORLEVEL% neq 0 exit 1
ctest --progress --output-on-failure || exit 1
)

popd
4 changes: 3 additions & 1 deletion recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ if [[ "${build_platform}" != "${target_platform}" ]]; then
CMAKE_ARGS="${CMAKE_ARGS} -DLLVM_LINK_EXECUTABLE=${BUILD_PREFIX}/bin/llvm-link"
CMAKE_ARGS="${CMAKE_ARGS} -DARROW_JEMALLOC_LG_PAGE=16"
CMAKE_ARGS="${CMAKE_ARGS} -DARROW_GRPC_CPP_PLUGIN=${BUILD_PREFIX}/bin/grpc_cpp_plugin"
CMAKE_ARGS="${CMAKE_ARGS} -DARROW_BUILD_TESTS=OFF"
else
CMAKE_ARGS="${CMAKE_ARGS} -DARROW_BUILD_TESTS=ON"
fi

# disable -fno-plt, which causes problems with GCC on PPC
Expand Down Expand Up @@ -64,7 +67,6 @@ cmake -GNinja \
-DARROW_BOOST_USE_SHARED=ON \
-DARROW_BUILD_BENCHMARKS=OFF \
-DARROW_BUILD_STATIC=OFF \
-DARROW_BUILD_TESTS=ON \
-DARROW_BUILD_UTILITIES=ON \
-DARROW_COMPUTE=ON \
-DARROW_CSV=ON \
Expand Down
18 changes: 12 additions & 6 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ source:
- patches/0003-Change-xsimd-inclusion-criterion.patch
# backport https://github.com/apache/arrow/pull/48261
- patches/0004-GH-48260-C-Python-R-Move-S3-bucket-references-to-new.patch
# backport https://github.com/apache/arrow/pull/48895
- patches/0005-GH-48894-Python-C-Use-base-Azure-Core-RequestFailedE.patch
# backport https://github.com/apache/arrow/pull/48601; needs C++20
- patches/0006-GH-48593-C-C-20-use-standard-calendar-timezone-APIs.patch # [win]
# disable gandiva tests that are "unmaintained" and failing on windows
- patches/0007-disable-some-gandiva-tests-related-to-tzdb-handling.patch # [win]

# testing-submodules not part of release tarball
- git_url: https://github.com/apache/arrow-testing.git
Expand Down Expand Up @@ -100,14 +106,14 @@ requirements:
- zlib
- zstd
# test requirements, c.f.
# https://github.com/apache/arrow/blob/apache-arrow-12.0.0/cpp/CMakeLists.txt#L842-L846
- gtest
# https://github.com/apache/arrow/blob/apache-arrow-12.0.0/cpp/src/arrow/flight/sql/CMakeLists.txt#L86-L87
- sqlite *
# https://github.com/apache/arrow/blob/apache-arrow-22.0.0/cpp/CMakeLists.txt#L689
- gtest # [build_platform == target_platform]
# https://github.com/apache/arrow/blob/apache-arrow-22.0.0/cpp/src/arrow/flight/sql/CMakeLists.txt#L112-L113
- sqlite * # [build_platform == target_platform]
# required by s3fs tests
- minio-server
- minio-server # [build_platform == target_platform]
# for npm, to install azurite
- nodejs *
- nodejs >=22 # [build_platform == target_platform]

outputs:
- name: apache-arrow-proc
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0001-disable-gcsfs_test.patch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From b7b6283fd8a9905d959a0f25f97293750aa7669c Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Sat, 2 Nov 2024 15:41:34 +1100
Subject: [PATCH 1/4] disable gcsfs_test
Subject: [PATCH 1/7] disable gcsfs_test

it cannot work unless we package https://github.com/googleapis/storage-testbench,
which however has extremely tight dependencies on protobuf etc., making it very
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 18258d1295a5e95426ec7b52a6412427d17b114d Mon Sep 17 00:00:00 2001
From: "H. Vetinari" <h.vetinari@gmx.com>
Date: Sun, 24 Nov 2024 20:22:35 +1100
Subject: [PATCH 2/4] skip NonExistentBucket test on osx
Subject: [PATCH 2/7] skip NonExistentBucket test on osx

---
cpp/src/arrow/filesystem/s3fs_test.cc | 4 ++++
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 37f86532af653cb230ff3b6c8040d6a8577fd3a4 Mon Sep 17 00:00:00 2001
From: AntoinePrv <AntoinePrv@users.noreply.github.com>
Date: Mon, 27 Oct 2025 10:25:58 +0100
Subject: [PATCH 3/4] Change xsimd inclusion criterion
Subject: [PATCH 3/7] Change xsimd inclusion criterion

---
cpp/src/arrow/util/byte_stream_split_internal.h | 4 +++-
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c4f7a9859aaebc9e7a94fea125e10c7d54d56a30 Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Fri, 28 Nov 2025 10:00:28 +0000
Subject: [PATCH 4/4] GH-48260: [C++][Python][R] Move S3 bucket references to
Subject: [PATCH 4/7] GH-48260: [C++][Python][R] Move S3 bucket references to
new bucket as Voltron Data ones will be removed soon (#48261)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Expand Down
Loading
Loading