github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Update vcpkg baseline (#6574)

Browse Source 
* Update vcpkg baseline

* Make code to compile with either newer or older version of opentelemetry-cpp

* Clang-format

* Suppress otel warnings in stress test code

* Update CI to update vcpkg cache if the run is PR-initiated

* Turn SSL caching off by default

* Make code to compile with either newer or older version of opentelemetry-cpp

* Clang-format

* Integrate the exact copy of #6581 - to make sure we're testing the same change with libcurl >= 8.12, and also make future merging easier

* Update cspell

* Move feature to bugfix

* Update vcpkg.yml

* Copy #6582 to verify against the latest libcurl

* Undo unnecessary changes

---------

Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com>
This commit is contained in:
Anton Kolesnyk 2025-05-21 11:57:28 -07:00 committed by GitHub
parent 6c6c4e9b35
commit 63ac69506f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake-modules/AzureVcpkg.cmake
View File

@ -18,7 +18,7 @@ macro(az_vcpkg_integrate)
message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.")
# GET VCPKG FROM SOURCE
# User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch
set(VCPKG_COMMIT_STRING f0f811770e0538fcb295a1750c0a5e0de5131d29) # default SDK tested commit
set(VCPKG_COMMIT_STRING 2c7705e70dcfb70e5f726459c3e399bd780bc1fc) # default SDK tested commit
if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT})
message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.")
set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit

2
eng/pipelines/templates/steps/vcpkg.yml
View File

@ -12,7 +12,7 @@ steps:
)
displayName: vcpkg --version
- ${{if and(eq(variables['System.TeamProject'], 'internal'), ne(variables['Build.Reason'], 'PullRequest')) }}:
- ${{if eq(variables['System.TeamProject'], 'internal') }}:
- task: AzurePowerShell@5
displayName: Set Vcpkg Write-mode Cache
inputs:

2
sdk/core/azure-core-tracing-opentelemetry/test/ut/test_exporter.hpp
View File

@ -430,6 +430,8 @@ public:
*/
bool Shutdown(std::chrono::microseconds) noexcept override { return true; }
bool ForceFlush(std::chrono::microseconds) noexcept override { return true; }
private:
std::shared_ptr<TestData> m_testData;
};

1
sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/eventhubs_stress_test.cpp
View File

@ -31,6 +31,7 @@
#pragma warning(push)
#pragma warning(disable : 4100)
#pragma warning(disable : 4244)
#pragma warning(disable : 4996)
#pragma warning(disable : 6323) // Disable "Use of arithmetic operator on Boolean type" warning.
#endif

1
sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/batch_stress_tests.hpp
View File

@ -14,6 +14,7 @@
#pragma warning(push)
#pragma warning(disable : 4100)
#pragma warning(disable : 4244)
#pragma warning(disable : 4996)
#pragma warning(disable : 6323) // Disable "Use of arithmetic operator on Boolean type" warning.
#endif

1
sdk/eventhubs/azure-messaging-eventhubs/test/eventhubs-stress-test/src/scenarios/inc/shared_functions.hpp
View File

@ -20,6 +20,7 @@
#pragma warning(push)
#pragma warning(disable : 4100)
#pragma warning(disable : 4244)
#pragma warning(disable : 4996)
#pragma warning(disable : 6323) // Disable "Use of arithmetic operator on Boolean type" warning.
#endif

2
vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "azure-sdk-for-cpp",
"version": "1.5.0",
"builtin-baseline": "f0f811770e0538fcb295a1750c0a5e0de5131d29",
"builtin-baseline": "2c7705e70dcfb70e5f726459c3e399bd780bc1fc",
"dependencies": [
{
"name": "curl"