Skip to content

[21.x] Rebuild for orc 2.2.2 #1906

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
h-vetinari merged 7 commits into from
Jan 23, 2026
Merged

[21.x] Rebuild for orc 2.2.2 #1906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
57b7a0e
Rebuild for orc 2.2.2
regro-cf-autotick-bot Jan 13, 2026
d64e7c9
MNT: Re-rendered with conda-smithy 3.54.1 and conda-forge-pinning 202…
regro-cf-autotick-bot Jan 13, 2026
caeb668
ensure failing tests on windows fail the build
h-vetinari Jan 13, 2026
b53fefc
backport patch for azure exception handling
h-vetinari Jan 20, 2026
b981fbc
require newer nodejs
h-vetinari Jan 22, 2026
c3d773e
restrict test deps of libarrow to platforms that can run tests
h-vetinari Jan 22, 2026
61915e8
do not build tests in cross-compilation
h-vetinari Jan 23, 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 ...support/linux_64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ lz4_c:
openssl:
- '3.5'
orc:
- 2.2.1
- 2.2.2
re2:
- 2025.08.12
snappy:
Expand Down
2 changes: 1 addition & 1 deletion ...support/linux_64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ lz4_c:
openssl:
- '3.5'
orc:
- 2.2.1
- 2.2.2
re2:
- 2025.08.12
snappy:
Expand Down
2 changes: 1 addition & 1 deletion ...rt/linux_aarch64_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ lz4_c:
openssl:
- '3.5'
orc:
- 2.2.1
- 2.2.2
re2:
- 2025.08.12
snappy:
Expand Down
2 changes: 1 addition & 1 deletion ...rt/linux_aarch64_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ lz4_c:
openssl:
- '3.5'
orc:
- 2.2.1
- 2.2.2
re2:
- 2025.08.12
snappy:
Expand Down
2 changes: 1 addition & 1 deletion ...rt/linux_ppc64le_c_compiler_version11cuda_compiler_version11.8cxx_compiler_version11.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ lz4_c:
openssl:
- '3.5'
orc:
- 2.2.1
- 2.2.2
re2:
- 2025.08.12
snappy:
Expand Down
2 changes: 1 addition & 1 deletion ...rt/linux_ppc64le_c_compiler_version14cuda_compiler_versionNonecxx_compiler_version14.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ lz4_c:
openssl:
- '3.5'
orc:
- 2.2.1
- 2.2.2
re2:
- 2025.08.12
snappy:
Expand Down
8 changes: 0 additions & 8 deletions .ci_support/migrations/aws_crt_cpp0354.yaml
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions .ci_support/migrations/brotli12.yaml
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions .ci_support/migrations/orc222.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for orc 2.2.2
kind: version
migration_number: 1
migrator_ts: 1768255856.7040284
orc:
- 2.2.2
2 changes: 1 addition & 1 deletion .ci_support/osx_64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ macos_machine:
openssl:
- '3.5'
orc:
- 2.2.1
- 2.2.2
re2:
- 2025.08.12
snappy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/osx_arm64_.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ macos_machine:
openssl:
- '3.5'
orc:
- 2.2.1
- 2.2.2
re2:
- 2025.08.12
snappy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_cuda_compiler_version11.8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ lz4_c:
openssl:
- '3.5'
orc:
- 2.2.1
- 2.2.2
re2:
- 2025.08.12
snappy:
Expand Down
2 changes: 1 addition & 1 deletion .ci_support/win_64_cuda_compiler_versionNone.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ lz4_c:
openssl:
- '3.5'
orc:
- 2.2.1
- 2.2.2
re2:
- 2025.08.12
snappy:
Expand Down
19 changes: 19 additions & 0 deletions .scripts/run_osx_build.sh
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,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
View file
Open in desktop
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
12 changes: 7 additions & 5 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ source:
- patches/0002-skip-NonExistentBucket-test-on-osx.patch
# backport https://github.com/apache/arrow/pull/48261
- patches/0003-GH-48260-C-Python-R-Move-S3-bucket-references-to-new.patch
# backport https://github.com/apache/arrow/pull/48895
- patches/0004-GH-48894-Python-C-Use-base-Azure-Core-RequestFailedE.patch

# testing-submodules not part of release tarball
- git_url: https://github.com/apache/arrow-testing.git
Expand All @@ -34,7 +36,7 @@ source:
folder: cpp/submodules/parquet-testing

build:
number: 14
number: 15
# for cuda support, building with one version is enough to be compatible with
# all later versions, since arrow is only using libcuda, and not libcudart.
skip: true # [cuda_compiler_version not in ("None", cuda_compiler_version_min)]
Expand Down Expand Up @@ -99,13 +101,13 @@ requirements:
- zstd
# test requirements, c.f.
# https://github.com/apache/arrow/blob/apache-arrow-12.0.0/cpp/CMakeLists.txt#L842-L846
- gtest
- gtest # [build_platform == target_platform]
# https://github.com/apache/arrow/blob/apache-arrow-12.0.0/cpp/src/arrow/flight/sql/CMakeLists.txt#L86-L87
- sqlite *
- 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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From c5d8f11d43881c3886c6dcecc33a9fe99347fc1d 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/3] disable gcsfs_test
Subject: [PATCH 1/4] 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
2 changes: 1 addition & 1 deletion recipe/patches/0002-skip-NonExistentBucket-test-on-osx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 98b3b3060bd76a8e399edbb8f6b434c346506c95 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/3] skip NonExistentBucket test on osx
Subject: [PATCH 2/4] skip NonExistentBucket test on osx

---
cpp/src/arrow/filesystem/s3fs_test.cc | 4 ++++
Expand Down
2 changes: 1 addition & 1 deletion recipe/patches/0003-GH-48260-C-Python-R-Move-S3-bucket-references-to-new.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 1f65acf586fa70fe77bf3b367c1dea613711c07c Mon Sep 17 00:00:00 2001
From: Nic Crane <thisisnic@gmail.com>
Date: Fri, 28 Nov 2025 10:00:28 +0000
Subject: [PATCH 3/3] GH-48260: [C++][Python][R] Move S3 bucket references to
Subject: [PATCH 3/4] 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