Skip to content

GH-49076: [CI] Update vcpkg baseline to newer version #49062

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
kou merged 7 commits into from
Jan 31, 2026
Merged

GH-49076: [CI] Update vcpkg baseline to newer version #49062

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8c54b77
WIP: [CI] Try updating vcpkg baseline
raulcd Jan 29, 2026
10803ea
Remove gtest feature as has been removed upstream
raulcd Jan 29, 2026
3e8a789
Guard against unofficial-utf8proc already defining utf8proc::utf8proc
raulcd Jan 29, 2026
6a518f2
Update vcpkg baseline for c_glib too
raulcd Jan 30, 2026
28a5b17
Drop special case for Findutf8proc when using vcpkg
raulcd Jan 30, 2026
47ee93d
Remove if block
raulcd Jan 30, 2026
4a4647d
Is the unofficial-utf8proc required?
raulcd Jan 30, 2026
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
2 changes: 1 addition & 1 deletion c_glib/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
"pkgconf"
],
"$comment": "We can update builtin-baseline by 'vcpkg x-update-baseline'",
"builtin-baseline": "09f6a4ef2f08252f7f4d924fd9c2d42165fb21c9"
"builtin-baseline": "40c89449f0ccce12d21f8a906639f6c2c649b9e7"
}
4 changes: 3 additions & 1 deletion cpp/cmake_modules/Findutf8proc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ if(ARROW_VCPKG)
endif()
find_package(utf8proc NAMES unofficial-utf8proc ${find_package_args})
if(utf8proc_FOUND)
add_library(utf8proc::utf8proc ALIAS utf8proc)
if(NOT TARGET utf8proc::utf8proc)
add_library(utf8proc::utf8proc ALIAS utf8proc)
endif()
return()
endif()
Comment on lines 34 to 36

@kou kou Jan 30, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Recent vcpkg's utf8proc CMake package provides utf8proc::utf8proc CMake target, right?
If so, we can remove this if block entirely. We don't need to support old vcpkg.

@raulcd raulcd Jan 30, 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.

I am trying dropping the if block entirely on the last commit. Will merge if CI is successful. Thanks @kou

@raulcd raulcd Jan 30, 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.

ok, I got confused but I think I understand what you meant @kou !

@kou kou Jan 31, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Oh, sorry for my confused comment.

endif()
Expand Down
9 changes: 2 additions & 7 deletions cpp/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,7 @@
]
},
"grpc",
{
"name": "gtest",
"features": [
"cxx17"
]
},
Comment on lines -45 to -49

@raulcd raulcd Jan 29, 2026 •
edited
Loading

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.

This isn't necessary anymore since:
microsoft/vcpkg@b00ff11

@AntoinePrv AntoinePrv Jan 30, 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.

Actually should we add cxx20?

@raulcd raulcd Jan 30, 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.

no, this was removed. There's no additional features on vcpkg anymore. You can see that on the commit above. This is how the current port file looks (no features):
https://github.com/microsoft/vcpkg/blob/master/ports/gtest/vcpkg.json

"gtest",
"lz4",
"openssl",
"orc",
Expand All @@ -62,5 +57,5 @@
"zstd"
],
"$comment": "We can update builtin-baseline by 'vcpkg x-update-baseline'",
"builtin-baseline": "09f6a4ef2f08252f7f4d924fd9c2d42165fb21c9"
"builtin-baseline": "40c89449f0ccce12d21f8a906639f6c2c649b9e7"
}
Loading