From 0181d8431557a47afa3d74c7dc3f849112627ada Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 10 Jul 2024 13:10:58 -0700 Subject: [PATCH 1/2] Disable macoslatest to unblock CI --- .../stages/platform-matrix-live.json | 16 ------------ .../templates/stages/platform-matrix.json | 25 ------------------- 2 files changed, 41 deletions(-) diff --git a/eng/pipelines/templates/stages/platform-matrix-live.json b/eng/pipelines/templates/stages/platform-matrix-live.json index ec191b489c..32f744c7f2 100644 --- a/eng/pipelines/templates/stages/platform-matrix-live.json +++ b/eng/pipelines/templates/stages/platform-matrix-live.json @@ -3,22 +3,6 @@ "_": "" }, "include": [ - { - "StaticConfigs": { - "macos-latest": { - "Pool": "env:MACPOOL", - "OSVmImage": "env:MACVMIMAGE", - "VCPKG_DEFAULT_TRIPLET": "x64-osx", - "BuildArgs": "-j 4" - } - }, - "BuildConfig": { - "x64_with_unit_test": { - "CmakeArgs": " -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON -DBUILD_SAMPLES=ON -DDISABLE_PROXY_TESTS=ON ", - "AZURE_CORE_ENABLE_JSON_TESTS": 1 - } - } - }, { "StaticConfigs": { "Ubu2204": { diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index 43e58a9a10..fcf8e76541 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -3,31 +3,6 @@ "_": "" }, "include": [ - { - "OSConfiguration": { - "macos-latest": { - "OSVmImage": "env:MACVMIMAGE", - "XCODE_VERSION": "14.2" - } - }, - "StaticConfigs": { - "_": { - "Pool": "env:MACPOOL", - "BuildArgs": "-j 10", - "VCPKG_DEFAULT_TRIPLET": "x64-osx", - "CmakeArgs": " -DBUILD_TESTING=ON -DENABLE_PROXY_TESTS=OFF -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_TRANSPORT_CURL=ON", - "PublishMapFiles": "true" - } - }, - "BuildConfig": { - "debug": { - "CMAKE_BUILD_TYPE": "Debug" - }, - "release": { - "CMAKE_BUILD_TYPE": "Release" - } - } - }, { "StaticConfigs": { "Win2019_x64_Release": { From 2a5ef50e964a2b3a523da58f26a68bbf491c414b Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 10 Jul 2024 13:20:09 -0700 Subject: [PATCH 2/2] Disable Mac --- .../templates/stages/platform-matrix-cmakegenerate.json | 5 ----- .../stages/platform-matrix-cmakesourcegenerate.json | 6 ------ 2 files changed, 11 deletions(-) diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json index d822c11374..ac3c56ce8e 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json +++ b/eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json @@ -12,11 +12,6 @@ "Pool": "env:WINDOWSPOOL", "OSVmImage": "env:WINDOWSVMIMAGE", "VCPKG_DEFAULT_TRIPLET": "x64-windows" - }, - "Mac": { - "Pool": "env:MACPOOL", - "OSVmImage": "env:MACVMIMAGE", - "VCPKG_DEFAULT_TRIPLET": "x64-osx" } } } diff --git a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json index 1ef1d36a85..885fff912c 100644 --- a/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json +++ b/eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json @@ -11,12 +11,6 @@ "OSVmImage": "env:LINUXNEXTVMIMAGE", "CmakeEnvArg": "", "AptDependencies": "libcurl4-openssl-dev" - }, - "Mac": { - "Pool": "env:MACPOOL", - "OSVmImage": "env:MACVMIMAGE", - "CmakeEnvArg": "OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@3/include ", - "BrewDependencies": "openssl" } } }