Skip to content

Commit

Permalink
Bump macOs version to macos-11 (#3853)
Browse files Browse the repository at this point in the history
  • Loading branch information
sima-zhu authored Jul 28, 2022
1 parent f2efced commit 9843c71
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
},
"Mac": {
"Pool": "Azure Pipelines",
"OSVmImage": "macOS-10.15",
"OSVmImage": "macos-11",
"VCPKG_DEFAULT_TRIPLET": "x64-osx"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"Mac": {
"Pool": "Azure Pipelines",
"OSVmImage": "macOS-10.15",
"OSVmImage": "macos-11",
"CmakeEnvArg": "OPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 OPENSSL_INCLUDE_DIR=/usr/local/opt/openssl@3/include ",
"BrewDependencies": "openssl"
}
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/platform-matrix-live.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"StaticConfigs": {
"MacOS_x64_with_unit_test": {
"Pool": "Azure Pipelines",
"OSVmImage": "macOS-10.15",
"OSVmImage": "macos-11",
"VCPKG_DEFAULT_TRIPLET": "x64-osx",
"CmakeArgs": " -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON -DBUILD_SAMPLES=ON",
"AZURE_CORE_ENABLE_JSON_TESTS": 1,
Expand Down
5 changes: 1 addition & 4 deletions eng/pipelines/templates/stages/platform-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@
"include": [
{
"OSConfiguration": {
"macOS-10.15": {
"OSVmImage": "macOS-10.15"
},
"macOS-11": {
"OSVmImage": "macOS-11",
"OSVmImage": "macos-11",
"XCODE_VERSION": "12.5.1"
}
},
Expand Down

0 comments on commit 9843c71

Please sign in to comment.