From c2834b3ff42e3566f33aaf5c0a154f436218a3db Mon Sep 17 00:00:00 2001 From: JinmingHu Date: Sat, 15 Jul 2023 11:43:54 +0800 Subject: [PATCH] Define CMakeTestOptions in Storage's ci.yml file (#4781) * Define CMakeTestOptions in Storage's ci.yml file * Update vcpkg.json --------- Co-authored-by: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> --- sdk/storage/azure-storage-blobs/CMakeLists.txt | 1 + sdk/storage/azure-storage-blobs/vcpkg.json | 6 +----- sdk/storage/azure-storage-common/CMakeLists.txt | 1 + sdk/storage/azure-storage-files-datalake/CMakeLists.txt | 1 + sdk/storage/azure-storage-files-datalake/vcpkg.json | 6 +----- sdk/storage/azure-storage-files-shares/CMakeLists.txt | 1 + sdk/storage/azure-storage-files-shares/vcpkg.json | 6 +----- sdk/storage/azure-storage-queues/CMakeLists.txt | 1 + sdk/storage/azure-storage-queues/vcpkg.json | 6 +----- sdk/storage/ci.yml | 5 +++++ 10 files changed, 14 insertions(+), 20 deletions(-) diff --git a/sdk/storage/azure-storage-blobs/CMakeLists.txt b/sdk/storage/azure-storage-blobs/CMakeLists.txt index 4faeca91d..3ef67230b 100644 --- a/sdk/storage/azure-storage-blobs/CMakeLists.txt +++ b/sdk/storage/azure-storage-blobs/CMakeLists.txt @@ -21,6 +21,7 @@ include(AzureDoxygen) include(AzureGlobalCompileOptions) include(AzureConfigRTTI) include(AzureBuildTargetForCI) +include(CreateMapFile) if(FETCH_SOURCE_DEPS) set(AZ_ALL_LIBRARIES ON) diff --git a/sdk/storage/azure-storage-blobs/vcpkg.json b/sdk/storage/azure-storage-blobs/vcpkg.json index 0d22be3a8..ffee16c6e 100644 --- a/sdk/storage/azure-storage-blobs/vcpkg.json +++ b/sdk/storage/azure-storage-blobs/vcpkg.json @@ -8,11 +8,7 @@ "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-blobs", "license": "MIT", "dependencies": [ - { - "name": "azure-storage-common-cpp", - "default-features": false, - "version>=": "12.3.1" - }, + "azure-storage-common-cpp", { "name": "vcpkg-cmake", "host": true diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt index d68a467b9..f088ceb12 100644 --- a/sdk/storage/azure-storage-common/CMakeLists.txt +++ b/sdk/storage/azure-storage-common/CMakeLists.txt @@ -21,6 +21,7 @@ include(AzureDoxygen) include(AzureGlobalCompileOptions) include(AzureConfigRTTI) include(AzureBuildTargetForCI) +include(CreateMapFile) if(FETCH_SOURCE_DEPS) set(AZ_ALL_LIBRARIES ON) diff --git a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt index 19faab7a5..d38d63fb4 100644 --- a/sdk/storage/azure-storage-files-datalake/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-datalake/CMakeLists.txt @@ -21,6 +21,7 @@ include(AzureDoxygen) include(AzureGlobalCompileOptions) include(AzureConfigRTTI) include(AzureBuildTargetForCI) +include(CreateMapFile) if(FETCH_SOURCE_DEPS) set(AZ_ALL_LIBRARIES ON) diff --git a/sdk/storage/azure-storage-files-datalake/vcpkg.json b/sdk/storage/azure-storage-files-datalake/vcpkg.json index 71649f223..f98a77ef4 100644 --- a/sdk/storage/azure-storage-files-datalake/vcpkg.json +++ b/sdk/storage/azure-storage-files-datalake/vcpkg.json @@ -8,11 +8,7 @@ "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-datalake", "license": "MIT", "dependencies": [ - { - "name": "azure-storage-blobs-cpp", - "default-features": false, - "version>=": "12.7.0" - }, + "azure-storage-blobs-cpp", { "name": "vcpkg-cmake", "host": true diff --git a/sdk/storage/azure-storage-files-shares/CMakeLists.txt b/sdk/storage/azure-storage-files-shares/CMakeLists.txt index c5694a949..ccb246037 100644 --- a/sdk/storage/azure-storage-files-shares/CMakeLists.txt +++ b/sdk/storage/azure-storage-files-shares/CMakeLists.txt @@ -21,6 +21,7 @@ include(AzureDoxygen) include(AzureGlobalCompileOptions) include(AzureConfigRTTI) include(AzureBuildTargetForCI) +include(CreateMapFile) if(FETCH_SOURCE_DEPS) set(AZ_ALL_LIBRARIES ON) diff --git a/sdk/storage/azure-storage-files-shares/vcpkg.json b/sdk/storage/azure-storage-files-shares/vcpkg.json index 0d25e6b8d..7bf9f1ec1 100644 --- a/sdk/storage/azure-storage-files-shares/vcpkg.json +++ b/sdk/storage/azure-storage-files-shares/vcpkg.json @@ -8,11 +8,7 @@ "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-files-shares", "license": "MIT", "dependencies": [ - { - "name": "azure-storage-common-cpp", - "default-features": false, - "version>=": "12.3.2" - }, + "azure-storage-common-cpp", { "name": "vcpkg-cmake", "host": true diff --git a/sdk/storage/azure-storage-queues/CMakeLists.txt b/sdk/storage/azure-storage-queues/CMakeLists.txt index 2d9bda45a..08748f444 100644 --- a/sdk/storage/azure-storage-queues/CMakeLists.txt +++ b/sdk/storage/azure-storage-queues/CMakeLists.txt @@ -21,6 +21,7 @@ include(AzureDoxygen) include(AzureGlobalCompileOptions) include(AzureConfigRTTI) include(AzureBuildTargetForCI) +include(CreateMapFile) if(FETCH_SOURCE_DEPS) set(AZ_ALL_LIBRARIES ON) diff --git a/sdk/storage/azure-storage-queues/vcpkg.json b/sdk/storage/azure-storage-queues/vcpkg.json index e81924b0d..767fe24b7 100644 --- a/sdk/storage/azure-storage-queues/vcpkg.json +++ b/sdk/storage/azure-storage-queues/vcpkg.json @@ -8,11 +8,7 @@ "homepage": "https://github.com/Azure/azure-sdk-for-cpp/tree/main/sdk/storage/azure-storage-queues", "license": "MIT", "dependencies": [ - { - "name": "azure-storage-common-cpp", - "default-features": false, - "version>=": "12.2.3" - }, + "azure-storage-common-cpp", { "name": "vcpkg-cmake", "host": true diff --git a/sdk/storage/ci.yml b/sdk/storage/ci.yml index 2be69e490..7e4cb2779 100644 --- a/sdk/storage/ci.yml +++ b/sdk/storage/ci.yml @@ -62,3 +62,8 @@ stages: Value: "DefaultEndpointsProtocol=https;AccountName=notReal;AccountKey=3333333333333333333333333333333333333333333333333333333333333333333333333333333333333333;EndpointSuffix=core.windows.net" - Name: PREMIUM_FILE_CONNECTION_STRING Value: "DefaultEndpointsProtocol=https;AccountName=notReal;AccountKey=3333333333333333333333333333333333333333333333333333333333333333333333333333333333333333;EndpointSuffix=core.windows.net" + CMakeTestOptions: + - Name: Default + Value: '' + - Name: Test + Value: '-DBUILD_TESTING=ON'