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

Upgrade msvcr140 and vcpkg dependencies #4872

Merged
merged 2 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 0 additions & 7 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -275,20 +275,13 @@ blocks:
prologue:
commands:
# install vcpkg in the parent directory.
- pwd
- cd ..
# Setup vcpkg
- "& .\\librdkafka\\win32\\setup-vcpkg.ps1"
- cd librdkafka
- ..\vcpkg\vcpkg integrate install
# Install required packages.
- ..\vcpkg\vcpkg --feature-flags=versions install --triplet $Env:triplet
- cd ..
- pwd
- ls vcpkg/
- echo $Env:VCPKG_ROOT
- pwd
- cd librdkafka
epilogue:
commands:
- Get-ChildItem . -include *.dll -recurse
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ librdkafka v2.6.1 is a maintenance release:
* Fix to remove fetch queue messages that blocked the destroy of rdkafka
instances (#4724)
* Upgrade Linux dependencies: OpenSSL 3.0.15, CURL 8.10.1 (#4875).
* Upgrade Windows dependencies: MSVC runtime to 14.40.338160.0,
zstd 1.5.6, zlib 1.3.1, OpenSSL 3.3.2, CURL 8.10.1 (#4872).


## Fixes
Expand Down
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
"dependencies": [
{
"name": "zstd",
"version>=": "1.5.5#2"
"version>=": "1.5.6#0"
},
{
"name": "zlib",
"version>=": "1.3"
"version>=": "1.3.1#0"
},
{
"name": "openssl",
"version>=": "3.0.8"
"version>=": "3.3.2#1"
pranavrth marked this conversation as resolved.
Show resolved Hide resolved
},
{
"name": "curl",
"version>=": "8.4.0"
"version>=": "8.10.1#0"
}
],
"builtin-baseline": "56765209ec0e92c58a5fd91aa09c46a16d660026"
Expand Down
2 changes: 1 addition & 1 deletion win32/setup-vcpkg.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if (!(Test-Path -Path vcpkg/.git)) {
}

cd vcpkg
git checkout 2023.11.20
git checkout 2024.09.30
cd ..

.\vcpkg\bootstrap-vcpkg.bat
Expand Down