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
12 changes: 9 additions & 3 deletions .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,12 @@ jobs:
BUILD_ALL: 0
BUILD_DRIVER_MANAGER: 1
CMAKE_BUILD_TYPE: Release
PLATFORM: ${{ matrix.os }}
run: |
if [[ "${PLATFORM}" == "Windows" ]]; then
# Target VS2022
export CMAKE_GENERATOR_TOOLSET=v143
fi
./ci/scripts/cpp_build.sh $(pwd) $(pwd)/build_driver_manager
./ci/scripts/java_build.sh $(pwd)
./ci/scripts/java_jni_build.sh $(pwd) $(pwd)/build_jni $(pwd)/build_driver_manager/local
Expand Down Expand Up @@ -962,6 +967,9 @@ jobs:
PYTHON_VERSION: "${{ matrix.python_version }}"
# Where to install vcpkg
VCPKG_ROOT: "${{ github.workspace }}\\vcpkg"
# Target VS2022 from VS2026
CMAKE_GENERATOR: Visual Studio 18 2026
CMAKE_GENERATOR_TOOLSET: v143
steps:
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
with:
Expand Down Expand Up @@ -1009,7 +1017,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
Expand All @@ -1031,8 +1039,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
Expand Down
6 changes: 4 additions & 2 deletions ci/scripts/python_wheel_windows_build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,13 @@ 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_TARGET_TRIPLET=x64-windows-static-2019
set VCPKG_DEFAULT_HOST_TRIPLET=x64-windows-static-2019
set VCPKG_OVERLAY_TRIPLETS=%source_dir%\ci\vcpkg\triplets

IF NOT DEFINED VCPKG_ROOT (echo "Must set VCPKG_ROOT" && exit /B 1)

Expand Down
23 changes: 23 additions & 0 deletions ci/vcpkg/triplets/x64-windows-static-2019.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# 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(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE static)
set(VCPKG_LIBRARY_LINKAGE static)

# Target VS2022
set(VCPKG_PLATFORM_TOOLSET v142)
Loading