From da6bf7a6058f81d1fd1f89fab9f7a959e31e4d67 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 29 Feb 2024 13:03:47 -0800 Subject: [PATCH 1/3] [ci] Build on performance build pools The Windows and Linux builds have been updated to use a new pool with a better VM SKU that has more CPU cores. PR builds on macOS will also use a static machine pool with better performance. --- build-tools/automation/azure-pipelines.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yml b/build-tools/automation/azure-pipelines.yml index 087628f..7486ed8 100644 --- a/build-tools/automation/azure-pipelines.yml +++ b/build-tools/automation/azure-pipelines.yml @@ -82,7 +82,7 @@ extends: displayName: Build Linux timeoutInMinutes: 480 pool: - name: AzurePipelines-EO + name: MAUI-1ESPT image: $(LinuxPoolImage1ESPT) os: linux templateContext: @@ -135,8 +135,11 @@ extends: displayName: Build macOS timeoutInMinutes: 480 pool: - name: Azure Pipelines - vmImage: macOS-12 + ${{ if eq(variables['MicroBuildSignType'], 'Real') }}: + name: Azure Pipelines + vmImage: macOS-latest + ${{ else }}: + name: VSEng-Xamarin-RedmondMac-Android-Untrusted os: macOS templateContext: outputs: @@ -178,7 +181,7 @@ extends: displayName: Build Windows timeoutInMinutes: 600 pool: - name: AzurePipelines-EO + name: MAUI-1ESPT image: $(WindowsPoolImage1ESPT) os: windows variables: @@ -207,7 +210,7 @@ extends: timeoutInMinutes: 480 pool: name: Azure Pipelines - vmImage: macOS-12 + vmImage: macOS-latest os: macOS templateContext: outputParentDirectory: $(Build.StagingDirectory) From e721904037f05288ec227eaa69678c41d9bfab56 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 29 Feb 2024 14:58:18 -0800 Subject: [PATCH 2/3] Don't upgrade any deps --- build-tools/automation/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yml b/build-tools/automation/azure-pipelines.yml index 7486ed8..e4ef365 100644 --- a/build-tools/automation/azure-pipelines.yml +++ b/build-tools/automation/azure-pipelines.yml @@ -159,7 +159,7 @@ extends: - script: | brew update - brew install cmake ninja ccache + export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install cmake ninja ccache displayName: Install LLVM build dependencies - script: export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install make xz From 230dbfa08c30a242b69af2686803c2157ba4fa77 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Thu, 29 Feb 2024 15:12:30 -0800 Subject: [PATCH 3/3] Fix pool condition --- build-tools/automation/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/automation/azure-pipelines.yml b/build-tools/automation/azure-pipelines.yml index e4ef365..87ed2ae 100644 --- a/build-tools/automation/azure-pipelines.yml +++ b/build-tools/automation/azure-pipelines.yml @@ -135,7 +135,7 @@ extends: displayName: Build macOS timeoutInMinutes: 480 pool: - ${{ if eq(variables['MicroBuildSignType'], 'Real') }}: + ${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(parameters.SignArtifactsOverride, 'true')) }}: name: Azure Pipelines vmImage: macOS-latest ${{ else }}: