From ef12972c5cec6eb888663f46d444aa008816d8ca Mon Sep 17 00:00:00 2001 From: Daniel Jurek Date: Wed, 8 Dec 2021 13:08:00 -0800 Subject: [PATCH] Move macos up to 10.15 or remove where there is sufficient 10.15 coverage (#3169) --- eng/pipelines/templates/jobs/archetype-sdk-tests.yml | 4 ++-- eng/pipelines/templates/stages/platform-matrix.json | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml index e28fe598a..da75d358a 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-tests.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-tests.yml @@ -129,7 +129,7 @@ jobs: #AZURE_CORE_ENABLE_JSON_TESTS: 1 # Testing Json lib on Win+WinHttp only, No need to repeat here as it is independent to the http transport adapter. MacOS_x64_with_unit_test: Pool: Azure Pipelines - OSVmImage: 'macOS-10.14' + OSVmImage: 'macOS-10.15' VcpkgInstall: 'curl[ssl] libxml2 openssl' VCPKG_DEFAULT_TRIPLET: 'x64-osx' CmakeArgs: ' -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON ' @@ -259,7 +259,7 @@ jobs: workingDirectory: build displayName: Generate Code Coverage Data condition: and(succeeded(), ne(variables['CODE_COVERAGE'], 'disabled'), ne(variables['CODE_COVERAGE'], '')) - + - task: PublishCodeCoverageResults@1 inputs: codeCoverageTool: Cobertura diff --git a/eng/pipelines/templates/stages/platform-matrix.json b/eng/pipelines/templates/stages/platform-matrix.json index 03558d070..d0f669cd0 100644 --- a/eng/pipelines/templates/stages/platform-matrix.json +++ b/eng/pipelines/templates/stages/platform-matrix.json @@ -5,9 +5,6 @@ "include": [ { "OSConfiguration": { - "macOS-10.14": { - "OSVmImage": "macOS-10.14" - }, "macOS-10.15": { "OSVmImage": "macOS-10.15" },