diff --git a/build-tools/automation/azure-pipelines.yml b/build-tools/automation/azure-pipelines.yml index a40bc4e..68b33c1 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: MAUI-1ESPT + name: AzurePipelines-EO image: $(LinuxPoolImage1ESPT) os: linux templateContext: @@ -135,11 +135,8 @@ extends: displayName: Build macOS timeoutInMinutes: 480 pool: - ${{ 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 + name: Azure Pipelines + vmImage: macOS-12 os: macOS templateContext: outputs: @@ -159,7 +156,7 @@ extends: - script: | brew update - export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install cmake ninja ccache + brew install cmake ninja ccache displayName: Install LLVM build dependencies - script: export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install make xz @@ -181,7 +178,7 @@ extends: displayName: Build Windows timeoutInMinutes: 600 pool: - name: MAUI-1ESPT + name: AzurePipelines-EO image: $(WindowsPoolImage1ESPT) os: windows variables: @@ -212,7 +209,7 @@ extends: timeoutInMinutes: 480 pool: name: Azure Pipelines - vmImage: macOS-latest + vmImage: macOS-12 os: macOS templateContext: outputParentDirectory: $(Build.StagingDirectory)