Skip to content
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.

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

Bump the vcpkg builtin-baseline. #5010

Merged
merged 16 commits into from
Aug 15, 2024
Merged

Bump the vcpkg builtin-baseline. #5010

merged 16 commits into from
Aug 15, 2024

Conversation

teo-tsirpanis
Copy link
Member

@teo-tsirpanis teo-tsirpanis commented May 27, 2024

SC-48154

This PR bumps the vcpkg builtin-baseline which causes all of our dependencies to be updated to the most recent versions available on vcpkg. Some of our custom ports are no longer needed and were removed as well.

To view the full list of updated ports, you can clone vcpkg and run git diff 72010900b7cee36cea77aebb97695095c9358eaf 101cc9a69a1061969caf4b73579a34873fdd60fe -- .\versions\baseline.json > baseline.diff. This is an abridged summary of the updated ports that we depend on:

Port Old version New version
aws-sdk-cpp 1.11.215 1.11.352
azure-core-cpp 1.10.3 1.13.0
azure-identity-cpp 1.6.0 1.8.0
azure-storage-blobs-cpp 12.10.0 12.11.0
azure-storage-common-cpp 12.5.0 12.6.0
catch2 3.4.0 3.6.0
capnproto 1.0.1 1.0.2
curl 8.4.0 8.8.0
fmt 10.1.1 10.2.1
google-cloud-cpp 2.19.0 2.25.0
libwebp 1.3.2 1.4.0
libxml2 2.11.6 2.11.7
openssl 3.1.4 3.3.1
pcre2 10.42 10.43
spdlog 1.12.0 1.14.1
zlib 1.3 1.3.1
zstd 1.5.5 1.5.6

The bump to the baseline might cause configure errors due to the vcpkg repository being out of date In this case, try one of the following things:

  • If you are using a cloned vcpkg repository and specified to the Core either a custom toolchain file, or the VCPKG_ROOT environment variable, update the vcpkg repository to the latest available commit, and try configuring again.
  • If you rely on the Core's build system to automatically download vcpkg (the default case), try deleting build/_deps and configure again. If it doesn't work, try performing a clean build.

Let me know if any additional testing is required.


TYPE: BUILD
DESC: Update vcpkg version baseline to microsoft/vcpkg@101cc9a.

|----------------------------|---------------------------------------------------------------------------------------------------------|
| `libmagic` | Updating to the upstream port deferred due to failures. |
| `openssl` | Pinning to OpenSSL 1.1 until we can move to 3.0 in January 2024. |
| `pcre2` | To be removed alongside libmagic. |
Copy link
Member Author

Choose a reason for hiding this comment

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

The custom port for PCRE2 was applying some patches to its CMake build system, to make it usable from libmagic. These patches are now upstreamed.

| `pcre2` | To be removed alongside libmagic. |
| `azure-storage-common-cpp` | Patching to disable default features on libxml2 (https://github.com/Azure/azure-sdk-for-cpp/pull/5221). |
| `libfaketime` | Port does not yet exist upstream |
| `vcpkg-cmake-config` | Patching to fix build issues with CMake 3.29.1. (https://github.com/microsoft/vcpkg/pull/38017) |
Copy link
Member Author

Choose a reason for hiding this comment

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

Subsequent versions of CMake 3.29.x have fixed the breaking change and this custom port is no longer needed.

@teo-tsirpanis teo-tsirpanis marked this pull request as ready for review May 28, 2024 12:43
@teo-tsirpanis teo-tsirpanis requested a review from KiterLuc May 28, 2024 12:43
@teo-tsirpanis teo-tsirpanis force-pushed the teo/bump-vcpkg-baseline branch from 4bc0adb to d8ae79d Compare June 18, 2024 10:18
This is not necessary and in fact it never had the intended effect; disabling default features had to be and was made in `azure-storage-common-cpp`.
The custom AWS SDK port is no longer needed; the patch has been upstreamed to vcpkg.
@teo-tsirpanis teo-tsirpanis force-pushed the teo/bump-vcpkg-baseline branch from d8ae79d to d1ddee5 Compare July 1, 2024 10:39
@teo-tsirpanis
Copy link
Member Author

I bumped the baseline again to get a more recent AWS and Google Cloud SDK version.

@teo-tsirpanis

This comment was marked as resolved.

@teo-tsirpanis teo-tsirpanis marked this pull request as draft July 15, 2024 10:09
@teo-tsirpanis teo-tsirpanis force-pushed the teo/bump-vcpkg-baseline branch from a6d9d66 to f496913 Compare July 15, 2024 10:45
@teo-tsirpanis teo-tsirpanis marked this pull request as ready for review July 15, 2024 11:54
@KiterLuc KiterLuc merged commit bcf0144 into dev Aug 15, 2024
64 checks passed
@KiterLuc KiterLuc deleted the teo/bump-vcpkg-baseline branch August 15, 2024 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants