GH-45994: [CI][GLib] Fix vcpkg configuration for Windows job #46006
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
|
|
github-actions
bot
added
Component: C++
Component: GLib
awaiting committer review
Member
Author
|
@github-actions crossbow submit test-build-vcpkg-win |
This comment was marked as outdated.
This comment was marked as outdated.
Member
Author
|
@github-actions crossbow submit test-build-vcpkg-win |
This comment was marked as outdated.
This comment was marked as outdated.
kou
force-pushed
the
glib-vcpkg
branch
3 times, most recently
from
6fe94e7 to
3a1fa83
Compare
Member
Author
|
@github-actions crossbow submit test-build-vcpkg-win |
This comment was marked as outdated.
This comment was marked as outdated.
Member
Author
|
@github-actions crossbow submit test-build-vcpkg-win |
This comment was marked as outdated.
This comment was marked as outdated.
Member
Author
|
@github-actions crossbow submit test-build-vcpkg-win |
Member
|
Let me know if this is ready for review! |
Member
Author
|
OK! This is the last error to be fixed: I think that we can fix it by using correct build configurations not changing existing code but I haven't found it yet... I think that I can fix this tomorrow... |
lidavidm
approved these changes
Apr 4, 2025
github-actions
bot
added
awaiting merge
Member
Author
|
@assignUser This is ready but there are many changes I thought... There were some problems to be fixed:
This PR fixes all of them. |
kou
commented
Apr 4, 2025
Comment on lines
+398
to
+411
| - name: Checkout vcpkg | ||
| uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 | ||
| with: | ||
| fetch-depth: 0 | ||
| path: vcpkg | ||
| repository: microsoft/vcpkg | ||
| - name: Bootstrap vcpkg | ||
| 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 |
Member
Author
There was a problem hiding this comment.
Ensure using the latest vcpkg. vcpkg exists in GitHub Actions runner by default. But it may be older than vcpkg we want to use.
| shell: cmd | ||
| run: | | ||
| set VCPKG_ROOT_KEEP=%VCPKG_ROOT% | ||
| call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 |
Member
Author
There was a problem hiding this comment.
This overrides VCPKG_ROOT. So we need to restore our VCPKG_ROOT after this.
| if generate_vapi | ||
| pkgconfig_variables += ['vapidir=@0@'.format(vapi_dir)] | ||
| add_languages('vala') | ||
| add_languages('vala', native: false) |
Member
Author
There was a problem hiding this comment.
This is not required but it reports a warning.
| common_args = {'version': [f'>=@version_no_snapshot@']} | ||
| arrow = dependency( | ||
| 'arrow', | ||
| 'Arrow', |
Member
Author
There was a problem hiding this comment.
This is for detecting a package for CMake.
| 'arrow', | ||
| 'Arrow', | ||
| kwargs: common_args, | ||
| modules: ['Arrow::arrow_shared'], |
Member
Author
There was a problem hiding this comment.
This is for detecting a package for CMake.
| meson setup \ | ||
| --backend=ninja \ | ||
| --prefix="${ARROW_HOME}" \ | ||
| --cmake-prefix-path="${meson_cmake_prefix_path}" \ |
Member
Author
There was a problem hiding this comment.
This is for finding CMake packages of Apache Arrow C++.
Comment on lines
+537
to
+544
| # We add -DARROW_STATIC only when static build is enabled because | ||
| # pkgconf 1.7.4 or later on Windows uses "--static" by default. If | ||
| # Cflags.private (-DARROW_STATIC) is used for shared linking, it | ||
| # will cause linke error. We recommend users to not use pkgconf for | ||
| # shared linking on Windows but we also provide a workaround here. | ||
| # If users don't enable ARROW_BUILD_STATIC, users can use pkgconf on | ||
| # Windows because Cflags.private is used but it has nothing. | ||
| string(APPEND ARROW_PC_CFLAGS_PRIVATE " -DARROW_STATIC") |
Member
Author
There was a problem hiding this comment.
This is a workaround for recent pkgconf on Windows. Our CI doesn't use -DARROW_BUILD_STATIC=ON.
Comment on lines
-1671
to
-1672
| OR ARROW_WITH_GRPC) | ||
| set(ARROW_NEED_GFLAGS 1) |
Member
Author
There was a problem hiding this comment.
Bundled gRPC doesn't need gflags.
This is not required because we use gflags provided by vcpkg. (This was needed before vcpkg adds CMake 4.0.0 workaround.)
| { | ||
| "name": "gtest", | ||
| "features": [ | ||
| "cxx17" |
Member
Author
There was a problem hiding this comment.
We need this because vcpkg's gtest uses C++14 by default.
| @rem changes in vcpkg | ||
|
|
||
| vcpkg install ^ | ||
| --triplet x64-windows ^ |
Member
Author
There was a problem hiding this comment.
We use VCPKG_DEFAULT_TRIPLET env instead of this.
github-actions
bot
added
awaiting changes
This was referenced Apr 4, 2025
raulcd
approved these changes
Apr 7, 2025
github-actions
bot
added
awaiting merge
assignUser
pushed a commit
that referenced
this pull request
Apr 7, 2025
### Rationale for this change We always use `BoostConfig.cmake` by #45623. We don't use `FindBoost.cmake`. We need to use recent vcpkg to use `BoostConfig.cmake` because old Boost doesn't provide it. ### What changes are included in this PR? * Update `vcpkg.json` for `cpp/` and `c_glib/`. * Always use the latest vcpkg instead of using vcpkg bundled in Visual Studio. * C++: Don't use gflags for building bundled gRPC because bundled gRPC doens't use gflags. * C++: Don't define `-D*_EXPORT` macros to `Cflags.private` in `*.pc` because pkgconf 1.7.4 or later uses `--static` by default on Windows. If `--static` is used by default, `*_EXPORT`s are defined for shared linking. It causes link errors. This is a workaround of this. * FYI: pkgconf/pkgconf@008d706 * GLib: Add support for finding Apache Arrow C++ by CMake. It's another workaround for the pkgconf problem. If we use CMake, the pkgconf problem isn't related. ### Are these changes tested? Yes. ### Are there any user-facing changes? Yes. * GitHub Issue: #45994 Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Raúl Cumplido <raulcumplido@gmail.com>
|
After merging your PR, Conbench analyzed the 4 benchmarking runs that have been run so far on merge-commit 3351aeb. There were no benchmark performance regressions. 🎉 The full Conbench report has more details. It also includes information about 6 possible false positives for unstable benchmarks that are known to sometimes produce them. |
zanmato1984
pushed a commit
to zanmato1984/arrow
that referenced
this pull request
Apr 15, 2025
…pache#46006) ### Rationale for this change We always use `BoostConfig.cmake` by apache#45623. We don't use `FindBoost.cmake`. We need to use recent vcpkg to use `BoostConfig.cmake` because old Boost doesn't provide it. ### What changes are included in this PR? * Update `vcpkg.json` for `cpp/` and `c_glib/`. * Always use the latest vcpkg instead of using vcpkg bundled in Visual Studio. * C++: Don't use gflags for building bundled gRPC because bundled gRPC doens't use gflags. * C++: Don't define `-D*_EXPORT` macros to `Cflags.private` in `*.pc` because pkgconf 1.7.4 or later uses `--static` by default on Windows. If `--static` is used by default, `*_EXPORT`s are defined for shared linking. It causes link errors. This is a workaround of this. * FYI: pkgconf/pkgconf@008d706 * GLib: Add support for finding Apache Arrow C++ by CMake. It's another workaround for the pkgconf problem. If we use CMake, the pkgconf problem isn't related. ### Are these changes tested? Yes. ### Are there any user-facing changes? Yes. * GitHub Issue: apache#45994 Authored-by: Sutou Kouhei <kou@clear-code.com> Signed-off-by: Raúl Cumplido <raulcumplido@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rationale for this change
We always use
BoostConfig.cmakeby #45623. We don't useFindBoost.cmake.We need to use recent vcpkg to use
BoostConfig.cmakebecause old Boost doesn't provide it.What changes are included in this PR?
vcpkg.jsonforcpp/andc_glib/.-D*_EXPORTmacros toCflags.privatein*.pcbecause pkgconf 1.7.4 or later uses--staticby default on Windows. If--staticis used by default,*_EXPORTs are defined for shared linking. It causes link errors. This is a workaround of this.Are these changes tested?
Yes.
Are there any user-facing changes?
Yes.