Skip to content

Bump the vcpkg builtin-baseline. #5756

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
shaunrd0 merged 7 commits into from
Feb 23, 2026
+10 −4
Merged

Bump the vcpkg builtin-baseline. #5756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
defdeca
Bump baseline commit.
shaunrd0 Feb 20, 2026
7ce6bcd
Regenerate capnp, format.
shaunrd0 Feb 20, 2026
8ab56a6
Fix azure warning.
shaunrd0 Feb 23, 2026
c803e77
Update azurite.
shaunrd0 Feb 23, 2026
28ef6fb
Pass skipApiVersionCheck to azurite.
shaunrd0 Feb 23, 2026
e8e75cc
Revert "Update azurite."
shaunrd0 Feb 23, 2026
b85cc9b
Temporarily set ApiVersion in Azure VFS.
shaunrd0 Feb 23, 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 cmake/Options/TileDBToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ if (NOT DEFINED CMAKE_TOOLCHAIN_FILE)
# Inspired from https://github.com/Azure/azure-sdk-for-cpp/blob/azure-core_1.10.3/cmake-modules/AzureVcpkg.cmake
message("TILEDB_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.")
# To help with resolving conflicts, when you update the commit, also update its date.
set(VCPKG_COMMIT_STRING 3b9d086009cc1c2256e9c28ad44a00036fbd9b26) # 2025-10-24
set(VCPKG_COMMIT_STRING dd930e314f529c86d2703a60d5ea7dd6573d9e5a) # 2026-2-19
message("Vcpkg commit string used: ${VCPKG_COMMIT_STRING}")
include(FetchContent)
FetchContent_Declare(
Expand Down
8 changes: 7 additions & 1 deletion tiledb/sm/filesystem/azure.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,9 @@ void Azure::AzureClientSingleton::ensure_initialized(
options.Retry.RetryDelay = params.retry_delay_;
options.Retry.MaxRetryDelay = params.max_retry_delay_;
options.Transport.Transport = create_transport(params.ssl_cfg_);
// TODO: Remove this when azurite updates to support the latest Azure API.
// https://github.com/Azure/Azurite/pull/2629
options.ApiVersion = "2025-11-05";

// Construct the Azure service credential.
auto credential =
Expand Down Expand Up @@ -350,6 +353,8 @@ void Azure::AzureClientSingleton::ensure_initialized(
::Azure::Storage::Files::DataLake::DataLakeClientOptions data_lake_options;
data_lake_options.Retry = options.Retry;
data_lake_options.Transport = options.Transport;
// TODO: Remove this when azurite updates to support the latest Azure API.
data_lake_options.ApiVersion = options.ApiVersion;

data_lake_client_ = make_service_client<DataLakeServiceClientType>(
GetDfsUrlFromUrl(params.blob_endpoint_), credential, data_lake_options);
Expand Down Expand Up @@ -1214,7 +1219,8 @@ LsObjects Azure::list_blobs_impl(
recursive ? "" : "/",
{.Prefix = blob_path,
.ContinuationToken = to_azure_nullable(continuation_token),
.PageSizeHint = max_keys});
.PageSizeHint = max_keys,
.StartFrom = {}});
Comment on lines +1222 to +1223
Copy link
Copy Markdown
Member

@teo-tsirpanis teo-tsirpanis Feb 23, 2026

Choose a reason for hiding this comment

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

Why was this changed? Isn't {} the default already?

Copy link
Copy Markdown
Member Author

@shaunrd0 shaunrd0 Feb 23, 2026

Choose a reason for hiding this comment

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

CI reported a werror for this after the update

https://github.com/TileDB-Inc/TileDB/actions/runs/22310958792/job/64542632032#step:13:125

continuation_token = from_azure_nullable(response.NextPageToken);

result.reserve(response.Blobs.size() + response.BlobPrefixes.size());
Expand Down
2 changes: 1 addition & 1 deletion tiledb/sm/serialization/tiledb-rest.capnp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#ifndef CAPNP_VERSION
#error \
"CAPNP_VERSION is not defined, is capnp/generated-header-support.h missing?"
#elif CAPNP_VERSION != 1002000
#elif CAPNP_VERSION != 1003000
Copy link
Copy Markdown
Member

@teo-tsirpanis teo-tsirpanis Feb 23, 2026

Choose a reason for hiding this comment

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

Only that changed? That's nice.

#error \
"Version mismatch between generated code and library headers. You must use the same version of the Cap'n Proto compiler and library."
#endif
Expand Down
2 changes: 1 addition & 1 deletion vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"builtin-baseline": "3b9d086009cc1c2256e9c28ad44a00036fbd9b26",
"builtin-baseline": "dd930e314f529c86d2703a60d5ea7dd6573d9e5a",
"dependencies": [
{
"name": "blosc2",
Expand Down
Loading