From 79428619232af32b9644cc4ff202d101e47b80f8 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Thu, 27 Oct 2022 17:36:30 -0700 Subject: [PATCH 1/2] Update vcpkg baseline (zlib vcpkg failure fix) --- cmake-modules/AzureVcpkg.cmake | 2 +- vcpkg.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index 076ef40dc8..2d43a7d911 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -21,7 +21,7 @@ macro(az_vcpkg_integrate) if(NOT DEFINED ENV{AZURE_SDK_DISABLE_AUTO_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 f0aa678b7471497f1adedcc99f40e1599ad22f69) # default SDK tested commit + set(VCPKG_COMMIT_STRING 6ca56aeb457f033d344a7106cb3f9f1abf8f4e98) # default SDK tested commit if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit endif() diff --git a/vcpkg.json b/vcpkg.json index cd5a98f950..d3d93e7cc0 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-c", "version": "1.0.0", - "builtin-baseline": "f0aa678b7471497f1adedcc99f40e1599ad22f69", + "builtin-baseline": "6ca56aeb457f033d344a7106cb3f9f1abf8f4e98", "dependencies": [ { "name": "curl" From 16b8efcaaf5059e289ab6963ac294e519b46395d Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Thu, 27 Oct 2022 17:58:23 -0700 Subject: [PATCH 2/2] Use override instead of SHA update --- cmake-modules/AzureVcpkg.cmake | 2 +- vcpkg.json | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index 2d43a7d911..076ef40dc8 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -21,7 +21,7 @@ macro(az_vcpkg_integrate) if(NOT DEFINED ENV{AZURE_SDK_DISABLE_AUTO_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 6ca56aeb457f033d344a7106cb3f9f1abf8f4e98) # default SDK tested commit + set(VCPKG_COMMIT_STRING f0aa678b7471497f1adedcc99f40e1599ad22f69) # default SDK tested commit if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit endif() diff --git a/vcpkg.json b/vcpkg.json index d3d93e7cc0..c4bd1cf042 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-c", "version": "1.0.0", - "builtin-baseline": "6ca56aeb457f033d344a7106cb3f9f1abf8f4e98", + "builtin-baseline": "f0aa678b7471497f1adedcc99f40e1599ad22f69", "dependencies": [ { "name": "curl" @@ -12,5 +12,11 @@ { "name": "cmocka" } + ], + "overrides": [ + { + "name": "zlib", + "version": "1.2.12#2" + } ] }