Repository navigation
Conversation
…DBC Windows builds The ODBC Windows action checked out microsoft/vcpkg at HEAD and never applied ci/vcpkg/ports.patch. Since apacheGH-55165 bumped vcpkg, protobuf v36.2 requires our fix-msvc-global-empty-string.patch to link with C++20 code on MSVC. Use ci/scripts/install_vcpkg.sh so the vcpkg version from .env is used and the patches are applied. Because we use manifest mode, also register the patched ports as overlay ports so vcpkg actually uses them.
|
|
|
I think the "AMD64 Debian SIMD Level None" failure is a real issue but unrelated to this PR. Maybe related to #54905. |
Right! The scheduled C++ Extra on main started failing for AMD64 Debian SIMD Level NONE 2 days ago. All C++ Extra jobs were green 3 days ago. (Here's a hypothetical draft PR #55319 as exploratory static linking fix post-#54905. fyi @raulcd) But failing JNI ubuntu-24.04-arm arm64/v8 is new! |
| - name: Install vcpkg | ||
| shell: bash |
There was a problem hiding this comment.
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 ArrowgRPC 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
There was a problem hiding this comment.
Thanks for noticing that. Can you file that as a separate (MINOR) PR?
github-actions
Bot
added
awaiting committer review
|
The upload job I triggered on my fork succeeded with this patch: https://github.com/amoeba/arrow/actions/runs/40915269876/job/123593711269 and the regular ODBC Windows job also succeeded: https://github.com/apache/arrow/actions/runs/40912388714/job/123586185486?pr=55317. |
amoeba
changed the title
|
@raulcd I think this proves the fix so I've marked the PR ready for review and I think you can cherry pick when you're ready. |
kou
left a comment
kou
left a comment
There was a problem hiding this comment.
+1 for 26.0.1.
It may be better to use the same approach as our wheel builds in the ODBC build, but we can work on it as a follow-up.
github-actions
Bot
added
awaiting merge
Rationale for this change
The ODBC Windows build uses a composite action that bootstraps vcpkg in a way that doesn't pick up ports.patch (or the pinned vcpkg version). This set up a scenario where #55167 broke the build and the ODBC upload step failed during the 26.0.0.1 release process.
As an aside, this didn't get caught by CI because the ODBC Windows job only runs on a daily schedule or at release time and #55167 hadn't been on
mainfor long enough. This is something to keep an eye out and possibly improve in the future.What changes are included in this PR?
Replace the way the job bootstraps vcpkg so it uses the normal
ci/scripts/install.shand directly overlays the port patches.Are these changes tested?
Yes, in CI.
Are there any user-facing changes?
No.
Was AI used for this PR?
In accordance to the AI generation guidelines, please disclose below whether and how AI was used in this PR.
PR code and description written by:
Reviewed before submission by: