Skip to content

Commit 6ab8310

Browse files
committed
Restore ci
1 parent f33f386 commit 6ab8310

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

ci/conan/all/conanfile.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ def requirements(self):
207207
self.requires("lz4/1.9.4")
208208
if self.options.with_snappy:
209209
self.requires("snappy/1.1.9")
210-
if self.options.get_safe("simd_level") is not None or \
211-
self.options.get_safe("runtime_simd_level") is not None:
212-
self.requires("xsimd/14.0.0")
210+
if self.options.get_safe("simd_level") != None or \
211+
self.options.get_safe("runtime_simd_level") != None:
212+
self.requires("xsimd/13.0.0")
213213
if self.options.with_zlib:
214214
self.requires("zlib/[>=1.2.11 <2]")
215215
if self.options.with_zstd:

ci/conda_env_cpp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ rapidjson
4747
re2
4848
snappy
4949
thrift-cpp>=0.11.0
50-
xsimd>=14.0
50+
xsimd
5151
zlib
5252
zstd

ci/docker/alpine-linux-3.22-cpp.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ RUN apk add \
6464
thrift-dev \
6565
tzdata \
6666
utf8proc-dev \
67+
xsimd-dev \
6768
zlib-dev \
6869
zstd-dev && \
6970
rm -rf /var/cache/apk/* && \
@@ -102,5 +103,4 @@ ENV ARROW_ACERO=ON \
102103
AWSSDK_SOURCE=BUNDLED \
103104
google_cloud_cpp_storage_SOURCE=BUNDLED \
104105
MUSL_LOCPATH=/usr/share/i18n/locales/musl \
105-
PATH=/usr/lib/ccache/bin:$PATH \
106-
xsimd_SOURCE=BUNDLED
106+
PATH=/usr/lib/ccache/bin:$PATH

ci/docker/debian-13-cpp.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ RUN apt-get update -y -q && \
7979
libthrift-dev \
8080
libutf8proc-dev \
8181
libxml2-dev \
82+
libxsimd-dev \
8283
libzstd-dev \
8384
llvm-${llvm}-dev \
8485
make \
@@ -141,5 +142,4 @@ ENV ARROW_ACERO=ON \
141142
google_cloud_cpp_storage_SOURCE=BUNDLED \
142143
ORC_SOURCE=BUNDLED \
143144
PATH=/usr/lib/ccache/:$PATH \
144-
PYTHON=python3 \
145-
xsimd_SOURCE=BUNDLED
145+
PYTHON=python3

ci/docker/debian-experimental-cpp.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ RUN if [ -n "${gcc}" ]; then \
7373
libthrift-dev \
7474
libutf8proc-dev \
7575
libxml2-dev \
76+
libxsimd-dev \
7677
libzstd-dev \
7778
make \
7879
ninja-build \
@@ -142,5 +143,4 @@ ENV ARROW_ACERO=ON \
142143
google_cloud_cpp_storage_SOURCE=BUNDLED \
143144
ORC_SOURCE=BUNDLED \
144145
PATH=/usr/lib/ccache/:$PATH \
145-
PYTHON=python3 \
146-
xsimd_SOURCE=BUNDLED
146+
PYTHON=python3

ci/docker/fedora-42-cpp.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ RUN dnf update -y && \
6565
utf8proc-devel \
6666
wget \
6767
which \
68+
xsimd-devel \
6869
zlib-devel
6970

7071
COPY ci/scripts/install_minio.sh /arrow/ci/scripts/
@@ -108,5 +109,4 @@ ENV ARROW_ACERO=ON \
108109
PARQUET_BUILD_EXAMPLES=ON \
109110
PARQUET_BUILD_EXECUTABLES=ON \
110111
PATH=/usr/lib/ccache/:$PATH \
111-
PYARROW_TEST_GANDIVA=OFF \
112-
xsimd_SOURCE=BUNDLED
112+
PYARROW_TEST_GANDIVA=OFF

0 commit comments

Comments
 (0)