This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new c14c4d7c2 build: update to VS2026 toolchain (#4303)
c14c4d7c2 is described below
commit c14c4d7c2295c585e1fecd8520dc6c0bb6f9d6d7
Author: David Li <[email protected]>
AuthorDate: Thu May 7 22:30:28 2026 +0900
build: update to VS2026 toolchain (#4303)
The Windows images now use VS2026:
https://github.com/actions/runner-images/issues/13638
---
.github/workflows/packaging.yml | 4 +---
ci/scripts/python_wheel_windows_build.bat | 3 ++-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index 1b1c1e9cc..02ab1ea99 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -1006,7 +1006,7 @@ jobs:
shell: pwsh
run: |
echo $env:VCPKG_VERSION
- git clone --shallow-since=2022-06-01
https://github.com/microsoft/vcpkg $env:VCPKG_ROOT
+ git clone --shallow-since=2024-06-01
https://github.com/microsoft/vcpkg $env:VCPKG_ROOT
pushd $env:VCPKG_ROOT
.\bootstrap-vcpkg.bat -disableMetrics
popd
@@ -1028,8 +1028,6 @@ jobs:
# TODO(https://github.com/apache/arrow-adbc/issues/4269): remove
cmd.exe usage
shell: cmd # zizmor: ignore[misfeature]
run: |
- where python.exe
- CALL "C:\Program Files\Microsoft Visual
Studio\2022\Community\VC\Auxiliary\Build\vcvars64.bat"
pushd adbc
set SETUPTOOLS_SCM_PRETEND_VERSION=%VERSION%
.\ci\scripts\python_wheel_windows_build.bat %cd% %cd%\build
diff --git a/ci/scripts/python_wheel_windows_build.bat
b/ci/scripts/python_wheel_windows_build.bat
index c2ea18715..4ca2051be 100644
--- a/ci/scripts/python_wheel_windows_build.bat
+++ b/ci/scripts/python_wheel_windows_build.bat
@@ -23,11 +23,12 @@ set build_dir=%2
echo "=== (%PYTHON_VERSION%) Building ADBC libpq driver ==="
set CMAKE_BUILD_TYPE=RelWithDebInfo
-set CMAKE_GENERATOR=Visual Studio 17 2022
+set CMAKE_GENERATOR=Visual Studio 18 2026
set CMAKE_GENERATOR_PLATFORM=x64
set CMAKE_UNITY_BUILD=ON
set VCPKG_FEATURE_FLAGS=-manifests
set VCPKG_TARGET_TRIPLET=x64-windows-static
+set VCPKG_DEFAULT_HOST_TRIPLET=x64-windows-static
IF NOT DEFINED VCPKG_ROOT (echo "Must set VCPKG_ROOT" && exit /B 1)
