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 b44ebb8f0 ci: use common vcpkg setup script for Windows CI (#4644)
b44ebb8f0 is described below
commit b44ebb8f02ad44115246622194fb833f8a3e49a0
Author: David Li <[email protected]>
AuthorDate: Wed Aug 5 13:47:59 2026 +0900
ci: use common vcpkg setup script for Windows CI (#4644)
Closes #3825.
Assisted-by: GPT-5.6 Sol <[email protected]>
---
.github/workflows/java.yml | 5 ++---
.github/workflows/native-windows.yml | 12 +++++-------
.github/workflows/packaging.yml | 29 +++++------------------------
ci/scripts/install_vcpkg.sh | 4 ++--
4 files changed, 14 insertions(+), 36 deletions(-)
diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml
index 1eea72513..2fb37e113 100644
--- a/.github/workflows/java.yml
+++ b/.github/workflows/java.yml
@@ -127,13 +127,12 @@ jobs:
cache: "maven"
distribution: "temurin"
java-version: 11
- - name: Retrieve Go, VCPKG version from .env
+ - name: Retrieve Go from .env
run: |
(. .env && echo "GO_VERSION=${GO}") >> $GITHUB_ENV
- (. .env && echo "VCPKG_VERSION=${VCPKG}") >> $GITHUB_ENV
- name: Install vcpkg
run: |
- ./ci/scripts/install_vcpkg.sh $VCPKG_ROOT $VCPKG_VERSION
+ ./ci/scripts/install_vcpkg.sh "$VCPKG_ROOT"
- uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e #
v7.0.0
with:
go-version: "${{ env.GO_VERSION }}"
diff --git a/.github/workflows/native-windows.yml
b/.github/workflows/native-windows.yml
index 2a8d0c22b..10e889a94 100644
--- a/.github/workflows/native-windows.yml
+++ b/.github/workflows/native-windows.yml
@@ -382,13 +382,11 @@ jobs:
# Needed for gendef tool in GoUtils.cmake
pacman --noconfirm -S mingw-w64-x86_64-tools
- # TODO(https://github.com/apache/arrow-adbc/issues/3825)
- - name: Clone vcpkg
- run: |
- git clone https://github.com/microsoft/vcpkg.git
- cd vcpkg
- git checkout ef7dbf94b9198bc58f45951adcf1f041fcbc5ea0
- .\bootstrap-vcpkg.bat
+ - name: Install vcpkg
+ shell: bash
+ env:
+ VCPKG_ROOT: ${{ github.workspace }}/vcpkg
+ run: ci/scripts/install_vcpkg.sh "$VCPKG_ROOT"
- name: Install vcpkg dependencies
working-directory: c
env:
diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml
index 441d5c120..596addbbb 100644
--- a/.github/workflows/packaging.yml
+++ b/.github/workflows/packaging.yml
@@ -810,18 +810,10 @@ jobs:
- name: Install Homebrew dependencies
run: brew install autoconf bash pkg-config ninja
- - name: Retrieve VCPKG version from .env
- id: vcpkg_version
- run: |
- pushd adbc
- vcpkg_version=$(cat ".env" | grep "VCPKG" | cut -d "=" -f2 | tr -d
'"')
- echo "VCPKG_VERSION=$vcpkg_version" | tee -a "$GITHUB_ENV"
- popd
-
- name: Install vcpkg
run: |
pushd adbc
- ci/scripts/install_vcpkg.sh $VCPKG_ROOT $VCPKG_VERSION
+ ci/scripts/install_vcpkg.sh "$VCPKG_ROOT"
popd
- name: Get required Go version
@@ -952,8 +944,7 @@ jobs:
python_version: ["3.10", "3.11", "3.12", "3.13", "3.14", "3.14t"]
env:
PYTHON_VERSION: "${{ matrix.python_version }}"
- # Where to install vcpkg
- VCPKG_ROOT: "${{ github.workspace }}\\vcpkg"
+ VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
steps:
- uses:
actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
with:
@@ -990,21 +981,11 @@ jobs:
choco install --no-progress -y cmake --installargs
'ADD_CMAKE_TO_PATH=System'
choco install --no-progress -y visualcpp-build-tools
- - name: Retrieve VCPKG version from .env
- shell: pwsh
- run: |
- pushd adbc
- Select-String -Path .env -Pattern 'VCPKG="(.+)"' | %
{"VCPKG_VERSION=$($_.matches.groups[1])"} >> $env:GITHUB_ENV
- popd
-
- name: Install vcpkg
- shell: pwsh
+ shell: bash
run: |
- echo $env:VCPKG_VERSION
- git clone --shallow-since=2024-06-01
https://github.com/microsoft/vcpkg $env:VCPKG_ROOT
- pushd $env:VCPKG_ROOT
- .\bootstrap-vcpkg.bat -disableMetrics
- popd
+ cd adbc
+ ./ci/scripts/install_vcpkg.sh "$VCPKG_ROOT"
- uses: actions/setup-go@b7ad1dad31e06c5925ef5d2fc7ad053ef454303e #
v7.0.0
with:
diff --git a/ci/scripts/install_vcpkg.sh b/ci/scripts/install_vcpkg.sh
index 1908fc541..5e911b7ca 100755
--- a/ci/scripts/install_vcpkg.sh
+++ b/ci/scripts/install_vcpkg.sh
@@ -27,7 +27,7 @@ if [ "$#" -lt 1 ]; then
fi
arrow_dir=$(cd -- "$(dirname -- "$0")/../.." && pwd -P)
-default_vcpkg_version=$(cat "${arrow_dir}/.env" | grep "VCPKG" | cut -d "="
-f2 | tr -d '"')
+default_vcpkg_version=$(cat "${arrow_dir}/.env" | grep "VCPKG=" | cut -d "="
-f2 | awk '{print $1}' | tr -d '"')
default_vcpkg_ports_patch="${arrow_dir}/ci/vcpkg/ports.patch"
vcpkg_destination=$1
@@ -35,7 +35,7 @@ vcpkg_version=${2:-$default_vcpkg_version}
vcpkg_ports_patch=${3:-$default_vcpkg_ports_patch}
# reduce the fetched data using a shallow clone
-git clone --shallow-since=2025-09-01 https://github.com/microsoft/vcpkg
${vcpkg_destination}
+git clone --shallow-since=2026-05-01 https://github.com/microsoft/vcpkg
${vcpkg_destination}
pushd ${vcpkg_destination}
