diff --git a/build-tools/automation/azure-pipelines.yml b/build-tools/automation/azure-pipelines.yml index 087628f..87ed2ae 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 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 }}: + name: VSEng-Xamarin-RedmondMac-Android-Untrusted os: macOS templateContext: outputs: @@ -156,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 @@ -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)