Skip to content

Commit d2315fe

Browse files
authored
GH-49115: [CI][Packaging][Python] Update vcpkg baseline for our wheels (#49116)
### Rationale for this change Current wheels are failing to be built due to old version of vcpkg failing with our latest main. ### What changes are included in this PR? - Update vcpkg version. - Update patches - Add `perl-Time-Piece` to some images as required to build newer OpenSSL. ### Are these changes tested? Yes on CI ### Are there any user-facing changes? No * GitHub Issue: #49115 Authored-by: Raúl Cumplido <raulcumplido@gmail.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent bfc698e commit d2315fe

5 files changed

Lines changed: 13 additions & 17 deletions

File tree

.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,14 @@ TZ=UTC
9393
# Used through compose.yaml and serves as the default version for the
9494
# ci/scripts/install_vcpkg.sh script. Prefer to use short SHAs to keep the
9595
# docker tags more readable.
96-
VCPKG="4334d8b4c8916018600212ab4dd4bbdc343065d1" # 2025.09.17 Release
96+
VCPKG="66c0373dc7fca549e5803087b9487edfe3aca0a1" # 2026.01.16 Release
9797

9898
# This must be updated when we update
9999
# ci/docker/python-*-windows-*.dockerfile or the vcpkg config.
100100
# This is a workaround for our CI problem that "archery docker build" doesn't
101101
# use pulled built images in dev/tasks/python-wheels/github.windows.yml.
102-
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-01-27
103-
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2026-01-27
102+
PYTHON_WHEEL_WINDOWS_IMAGE_REVISION=2026-02-02
103+
PYTHON_WHEEL_WINDOWS_TEST_IMAGE_REVISION=2026-02-02
104104

105105
# Use conanio/${CONAN_BASE}:{CONAN_VERSION} for "docker compose run --rm conan".
106106
# See https://github.com/conan-io/conan-docker-tools#readme and

ci/docker/cpp-jni.dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ RUN dnf install -y \
2929
gdb \
3030
git \
3131
perl-IPC-Cmd \
32+
perl-Time-Piece \
3233
wget \
3334
zip
3435

ci/docker/python-wheel-manylinux.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ ENV LINUX_WHEEL_KIND='manylinux'
2626
ENV LINUX_WHEEL_VERSION=${manylinux}
2727

2828
# Install basic dependencies
29-
RUN dnf install -y git flex curl autoconf zip perl-IPC-Cmd wget
29+
RUN dnf install -y git flex curl autoconf zip perl-IPC-Cmd perl-Time-Piece wget
3030

3131
# A system Python is required for Ninja and vcpkg in this Dockerfile.
3232
# On manylinux_2_28 base images, no system Python is installed.

ci/scripts/python_wheel_macos_build.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ else
4646
exit 1
4747
fi
4848

49-
echo "=== (${PYTHON_VERSION}) Install Python build dependencies ==="
50-
export PIP_SITE_PACKAGES=$(python -c 'import site; print(site.getsitepackages()[0])')
51-
5249
# Remove once there are released Cython wheels for 3.13 free-threaded available
5350
FREE_THREADED_BUILD="$(python -c"import sysconfig; print(bool(sysconfig.get_config_var('Py_GIL_DISABLED')))")"
5451
if [[ $FREE_THREADED_BUILD == "True" ]]; then
@@ -58,7 +55,6 @@ fi
5855
pip install \
5956
--force-reinstall \
6057
--only-binary=:all: \
61-
--target $PIP_SITE_PACKAGES \
6258
--upgrade \
6359
-r ${source_dir}/python/requirements-wheel-build.txt
6460
pip install "delocate>=0.10.3"

ci/vcpkg/ports.patch

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -66,15 +66,14 @@ index 0000000000..25568e70cd
6666
+ }
6767
+
6868
diff --git a/ports/orc/portfile.cmake b/ports/orc/portfile.cmake
69-
index 77ebf41ec3..4d065594a7 100644
69+
index 278bc17a1c..d47d859360 100644
7070
--- a/ports/orc/portfile.cmake
7171
+++ b/ports/orc/portfile.cmake
72-
@@ -6,6 +6,8 @@ vcpkg_from_github(
73-
REF "v${VERSION}"
74-
SHA512 eabee16a6e984452a8cb715d0524041b20dd1bd88d78bb32534db93e5dbdd786aa4df8c05975406cb0728241eb3025a506c4fefb8c334ef0d8a27e6cb920d44c
75-
HEAD_REF master
76-
+ PATCHES
77-
+ orc-fix-exception-propagation.diff
72+
@@ -9,6 +9,7 @@ vcpkg_from_github(
73+
PATCHES
74+
external-project.diff
75+
tools-build.diff
76+
+ orc-fix-exception-propagation.diff
7877
)
79-
80-
file(REMOVE "${SOURCE_PATH}/cmake_modules/FindGTest.cmake")
78+
file(GLOB modules "${SOURCE_PATH}/cmake_modules/Find*.cmake")
79+
file(REMOVE ${modules} "${SOURCE_PATH}/c++/libs/libhdfspp/libhdfspp.tar.gz")

0 commit comments

Comments
 (0)