File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -92,11 +92,11 @@ TZ=UTC
9292# Used through compose.yaml and serves as the default version for the
9393# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
9494# docker tags more readable.
95- VCPKG = " 66c0373dc7fca549e5803087b9487edfe3aca0a1 " # 2026.01.16 Release
95+ VCPKG = " 9b965a116838c6cdcd36bca60d1b81b030c8ab8d " # 2026.05.27 (not release, upstream commit)
9696
9797# This must be updated when we update
9898# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
9999# This is a workaround for our CI problem that "archery docker build" doesn't
100100# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
101- PYTHON_WHEEL_WINDOWS_IMAGE_REVISION = 2026-03-04
102- PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION = 2026-03-04
101+ PYTHON_WHEEL_WINDOWS_IMAGE_REVISION = 2026-05-27
102+ PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION = 2026-05-27
Original file line number Diff line number Diff line change @@ -50,6 +50,11 @@ ARG ccache=4.1
5050COPY ci/scripts/install_ccache.sh arrow/ci/scripts/
5151RUN /arrow/ci/scripts/install_ccache.sh ${ccache} /usr/local
5252
53+ # Install newer bison (required for building thrift)
54+ ARG bison=3.7.6
55+ COPY ci/scripts/install_bison.sh arrow/ci/scripts/
56+ RUN /arrow/ci/scripts/install_bison.sh ${bison} /usr/local
57+
5358# Install vcpkg
5459ARG vcpkg
5560COPY ci/vcpkg/*.patch \
Original file line number Diff line number Diff line change 1+ #! /usr/bin/env bash
2+ #
3+ # Licensed to the Apache Software Foundation (ASF) under one
4+ # or more contributor license agreements. See the NOTICE file
5+ # distributed with this work for additional information
6+ # regarding copyright ownership. The ASF licenses this file
7+ # to you under the Apache License, Version 2.0 (the
8+ # "License"); you may not use this file except in compliance
9+ # with the License. You may obtain a copy of the License at
10+ #
11+ # http://www.apache.org/licenses/LICENSE-2.0
12+ #
13+ # Unless required by applicable law or agreed to in writing,
14+ # software distributed under the License is distributed on an
15+ # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+ # KIND, either express or implied. See the License for the
17+ # specific language governing permissions and limitations
18+ # under the License.
19+
20+ set -e
21+
22+ if [ " $# " -ne 2 ]; then
23+ echo " Usage: $0 <version> <prefix>"
24+ exit 1
25+ fi
26+
27+ version=$1
28+ prefix=$2
29+
30+ mkdir -p /tmp/bison
31+ url=" https://ftp.gnu.org/gnu/bison/bison-${version} .tar.gz"
32+
33+ wget -q " ${url} " -O - | tar -xzf - --directory /tmp/bison --strip-components=1
34+
35+ pushd /tmp/bison
36+ ./configure --prefix=${prefix}
37+ make -j$( nproc)
38+ make install
39+ popd
40+
41+ rm -rf /tmp/bison
Original file line number Diff line number Diff line change 11diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake
2- index 6788bc7b7f..6b689dedf0 100644
2+ index 73f5aece46..68cdb3966f 100644
33--- a/ports/curl/portfile.cmake
44+++ b/ports/curl/portfile.cmake
5- @@ -83,10 +83,13 @@ vcpkg_cmake_configure(
5+ @@ -89,6 +89,8 @@ vcpkg_cmake_configure(
66 -DENABLE_CURL_MANUAL=OFF
77 -DIMPORT_LIB_SUFFIX= # empty
88 -DSHARE_LIB_OBJECT=OFF
99+ -DCURL_CA_PATH=none
1010+ -DCURL_CA_BUNDLE=none
11+ -DCURL_USE_CMAKECONFIG=ON
1112 -DCURL_USE_PKGCONFIG=ON
1213 -DCMAKE_DISABLE_FIND_PACKAGE_Perl=ON
13- MAYBE_UNUSED_VARIABLES
14- PKG_CONFIG_EXECUTABLE
14+ @@ -98,6 +100,7 @@ vcpkg_cmake_configure(
15+ VCPKG_LOCK_FIND_PACKAGE_Libidn2
16+ VCPKG_LOCK_FIND_PACKAGE_Libssh2
17+ VCPKG_LOCK_FIND_PACKAGE_NGHTTP2
1518+ ${EXTRA_ARGS_DEBUG}
1619 )
1720 vcpkg_cmake_install()
You can’t perform that action at this time.
0 commit comments