From 893e8e71aa6f16ae7cad6dfc15620415d8e3b7cb Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 1 Nov 2024 10:10:42 -0700 Subject: [PATCH 1/3] Upgrade our macOS build machines to the latest non-beta x64 image. --- eng/pipelines/common/xplat-setup.yml | 2 +- eng/pipelines/coreclr/perf-non-wasm-jobs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index f50a2db9e81ec5..c3ff892bfa0b0c 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -170,7 +170,7 @@ jobs: # OSX Public Build Pool (we don't have on-prem OSX BuildPool). ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}: - vmImage: 'macos-12' + vmImage: 'macos-latest-large' # The -large images are x64 macOS machines. # OSX Internal Pool ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}: diff --git a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml index df9c99e5297d63..4464a3f6512161 100644 --- a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml +++ b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml @@ -374,7 +374,7 @@ jobs: nameSuffix: PerfBDNApp isOfficialBuild: false pool: - vmImage: 'macos-12' + vmImage: 'macos-latest-large' postBuildSteps: - template: /eng/pipelines/coreclr/templates/build-perf-bdn-app.yml parameters: From 5f65b3c08acbd834071da34a574ba39677ac4149 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Fri, 1 Nov 2024 10:28:33 -0700 Subject: [PATCH 2/3] Only upgrade to 13, the -large variants don't exist on AzDO --- eng/pipelines/common/xplat-setup.yml | 2 +- eng/pipelines/coreclr/perf-non-wasm-jobs.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index c3ff892bfa0b0c..fb809683d50bb4 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -170,7 +170,7 @@ jobs: # OSX Public Build Pool (we don't have on-prem OSX BuildPool). ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}: - vmImage: 'macos-latest-large' # The -large images are x64 macOS machines. + vmImage: 'macos-13' # OSX Internal Pool ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}: diff --git a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml index 4464a3f6512161..78b035fa0228ea 100644 --- a/eng/pipelines/coreclr/perf-non-wasm-jobs.yml +++ b/eng/pipelines/coreclr/perf-non-wasm-jobs.yml @@ -374,7 +374,7 @@ jobs: nameSuffix: PerfBDNApp isOfficialBuild: false pool: - vmImage: 'macos-latest-large' + vmImage: 'macos-13' postBuildSteps: - template: /eng/pipelines/coreclr/templates/build-perf-bdn-app.yml parameters: From b0be3049b420c5f333746bd2500faf78aedc88a5 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 4 Nov 2024 10:41:47 -0800 Subject: [PATCH 3/3] Use macos-13 for official builds as well --- eng/pipelines/common/xplat-setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index fb809683d50bb4..39676f8fd9b292 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -175,7 +175,7 @@ jobs: # OSX Internal Pool ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}: name: "Azure Pipelines" - vmImage: 'macOS-12' + vmImage: 'macOS-13' os: macOS # Official Build Windows Pool