Skip to content

GH-55316: [CI][FlightRPC][ODBC] Apply ports.patch in Windows build #55317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raulcd merged 1 commit into from
Oct 30, 2026
+19 −15
Merged

GH-55316: [CI][FlightRPC][ODBC] Apply ports.patch in Windows build #55317

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 19 additions & 15 deletions .github/actions/odbc-windows/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,26 @@ runs:
path: ${{ steps.ccache-info.outputs.cache-dir }}
key: cpp-odbc-ccache-windows-x64-${{ hashFiles('cpp/**') }}
restore-keys: cpp-odbc-ccache-windows-x64-
- name: Checkout vcpkg
uses: actions/checkout@v6
with:
persist-credentials: false
fetch-depth: 0
path: vcpkg
repository: microsoft/vcpkg
- name: Bootstrap vcpkg
shell: pwsh
- name: Install vcpkg
shell: bash
Comment on lines +57 to +58

@alinaliBQ alinaliBQ Oct 29, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

diff --git a/.github/workflows/package_odbc.yml b/.github/workflows/package_odbc.yml
index 121402810b..74ec031b37 100644
--- a/.github/workflows/package_odbc.yml
+++ b/.github/workflows/package_odbc.yml
@@ -66,7 +66,7 @@ jobs:
       ARROW_USE_STATIC_CRT: OFF
       CMAKE_GENERATOR: Ninja
       CMAKE_INSTALL_PREFIX: /usr
-      VCPKG_BINARY_SOURCES: 'clear;nugettimeout,600;nuget,GitHub,readwrite'
+      VCPKG_BINARY_SOURCES: 'clear;nugettimeout,1800;nuget,GitHub,readwrite'
       VCPKG_DEFAULT_TRIPLET: x64-windows-static-md
     steps:
       - name: Checkout Arrow

gRPC build can take very long to upload to nuget. To make upload of gRPC successful, I tested that the timeout increase fixed the issue.
A run on my fork:
https://github.com/Bit-Quill/arrow/actions/runs/40787074489/job/123162825045#step:3:6

@amoeba amoeba Oct 29, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for noticing that. Can you file that as a separate (MINOR) PR?

@alinaliBQ alinaliBQ Oct 29, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yup

@alinaliBQ alinaliBQ Oct 29, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Filed #55320

run: |
vcpkg\bootstrap-vcpkg.bat
$VCPKG_ROOT = $(Resolve-Path -LiteralPath "vcpkg").ToString()
Write-Output ${VCPKG_ROOT} | `
Out-File -FilePath ${Env:GITHUB_PATH} -Encoding utf8 -Append
Write-Output "VCPKG_ROOT=${VCPKG_ROOT}" | `
Out-File -FilePath ${Env:GITHUB_ENV} -Encoding utf8 -Append
# GH-55316: Use the vcpkg version pinned in .env and apply
# ci/vcpkg/ports.patch like other vcpkg based builds do.
ci/scripts/install_vcpkg.sh vcpkg
VCPKG_ROOT=$(cygpath --windows "$(pwd)/vcpkg")
echo "${VCPKG_ROOT}" >> "${GITHUB_PATH}"
echo "VCPKG_ROOT=${VCPKG_ROOT}" >> "${GITHUB_ENV}"
# We use manifest mode with builtin-baseline. vcpkg resolves
# ports from its versions database in manifest mode, so local
# changes by ports.patch are ignored unless the patched ports
# are used as overlay ports.
vcpkg_ports_dir=$(cygpath --mixed "$(pwd)/vcpkg/ports")
overlay_ports=()
for port in $(sed -n -E 's,^diff --git a/ports/([^/]+)/.*,\1,p' \
ci/vcpkg/ports.patch | sort -u); do
overlay_ports+=("${vcpkg_ports_dir}/${port}")
done
echo "VCPKG_OVERLAY_PORTS=$(IFS=';'; echo "${overlay_ports[*]}")" >> "${GITHUB_ENV}"
- name: Setup NuGet credentials for vcpkg caching
shell: bash
run: |
Expand Down
Loading