Skip to content
Open
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
6 changes: 3 additions & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ TZ=UTC
# Used through compose.yaml and serves as the default version for the
# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
# docker tags more readable.
VCPKG="66c0373dc7fca549e5803087b9487edfe3aca0a1" # 2026.01.16 Release
VCPKG="9b965a116838c6cdcd36bca60d1b81b030c8ab8d" # 2026.05.27 (not release, upstream commit)

# This must be updated when we update
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
# This is a workaround for our CI problem that "archery docker build" doesn't
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-03-04
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2026-03-04
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-05-27
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2026-05-27
Comment thread
raulcd marked this conversation as resolved.
5 changes: 5 additions & 0 deletions ci/docker/cpp-jni.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ ARG ccache=4.1
COPY ci/scripts/install_ccache.sh arrow/ci/scripts/
RUN /arrow/ci/scripts/install_ccache.sh ${ccache} /usr/local

# Install bison (> 3.7 required for building thrift)
ARG bison=3.7.6
COPY ci/scripts/install_bison.sh arrow/ci/scripts/
RUN /arrow/ci/scripts/install_bison.sh ${bison} /usr/local

# Install vcpkg
ARG vcpkg
COPY ci/vcpkg/*.patch \
Expand Down
5 changes: 5 additions & 0 deletions ci/docker/python-wheel-manylinux.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,11 @@ ARG ccache=4.1
COPY ci/scripts/install_ccache.sh arrow/ci/scripts/
RUN /arrow/ci/scripts/install_ccache.sh ${ccache} /usr/local

# Install bison (> 3.7 required for building thrift)
ARG bison=3.7.6
COPY ci/scripts/install_bison.sh arrow/ci/scripts/
RUN /arrow/ci/scripts/install_bison.sh ${bison} /usr/local

# Install vcpkg
ARG vcpkg
COPY ci/vcpkg/*.patch \
Expand Down
41 changes: 41 additions & 0 deletions ci/scripts/install_bison.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#!/usr/bin/env bash
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

set -e

if [ "$#" -ne 2 ]; then
echo "Usage: $0 <version> <prefix>"
exit 1
fi

version=$1
prefix=$2

mkdir -p /tmp/bison
url="https://ftp.gnu.org/gnu/bison/bison-${version}.tar.gz"

wget -q "${url}" -O - | tar -xzf - --directory /tmp/bison --strip-components=1

Comment on lines +20 to +34
pushd /tmp/bison
./configure --prefix="${prefix}"
make -j$(nproc)
make install
popd

rm -rf /tmp/bison
Comment on lines +30 to +41
11 changes: 7 additions & 4 deletions ci/vcpkg/ports.patch
Original file line number Diff line number Diff line change
@@ -1,17 +1,20 @@
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
index 6788bc7b7f..6b689dedf0 100644
index 73f5aece46..68cdb3966f 100644
--- a/ports/curl/portfile.cmake
+++ b/ports/curl/portfile.cmake
@@ -83,10 +83,13 @@ vcpkg_cmake_configure(
@@ -89,6 +89,8 @@ vcpkg_cmake_configure(
-DENABLE_CURL_MANUAL=OFF
-DIMPORT_LIB_SUFFIX= # empty
-DSHARE_LIB_OBJECT=OFF
+ -DCURL_CA_PATH=none
+ -DCURL_CA_BUNDLE=none
-DCURL_USE_CMAKECONFIG=ON
-DCURL_USE_PKGCONFIG=ON
Comment thread
raulcd marked this conversation as resolved.
-DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
MAYBE_UNUSED_VARIABLES
PKG_CONFIG_EXECUTABLE
@@ -98,6 +100,7 @@ vcpkg_cmake_configure(
VCPKG_LOCK_FIND_PACKAGE_Libidn2
VCPKG_LOCK_FIND_PACKAGE_Libssh2
VCPKG_LOCK_FIND_PACKAGE_NGHTTP2
+ ${EXTRA_ARGS_DEBUG}
Comment thread
raulcd marked this conversation as resolved.
)
vcpkg_cmake_install()
Expand Down
Loading