Skip to content

Commit cd38954

Browse files
committed
Merge branch 'main' into dev/grendel/as-on-windows
* main: [ci] Build on performance build pools (#15)
2 parents 7c4f24c + dae2eb6 commit cd38954

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

build-tools/automation/azure-pipelines.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ extends:
8282
displayName: Build Linux
8383
timeoutInMinutes: 480
8484
pool:
85-
name: AzurePipelines-EO
85+
name: MAUI-1ESPT
8686
image: $(LinuxPoolImage1ESPT)
8787
os: linux
8888
templateContext:
@@ -135,8 +135,11 @@ extends:
135135
displayName: Build macOS
136136
timeoutInMinutes: 480
137137
pool:
138-
name: Azure Pipelines
139-
vmImage: macOS-12
138+
${{ if or(startsWith(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(parameters.SignArtifactsOverride, 'true')) }}:
139+
name: Azure Pipelines
140+
vmImage: macOS-latest
141+
${{ else }}:
142+
name: VSEng-Xamarin-RedmondMac-Android-Untrusted
140143
os: macOS
141144
templateContext:
142145
outputs:
@@ -156,7 +159,7 @@ extends:
156159

157160
- script: |
158161
brew update
159-
brew install cmake ninja ccache
162+
export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install cmake ninja ccache
160163
displayName: Install LLVM build dependencies
161164
162165
- script: export HOMEBREW_NO_INSTALL_UPGRADE=1 && brew install make xz
@@ -178,7 +181,7 @@ extends:
178181
displayName: Build Windows
179182
timeoutInMinutes: 600
180183
pool:
181-
name: AzurePipelines-EO
184+
name: MAUI-1ESPT
182185
image: $(WindowsPoolImage1ESPT)
183186
os: windows
184187
variables:
@@ -209,7 +212,7 @@ extends:
209212
timeoutInMinutes: 480
210213
pool:
211214
name: Azure Pipelines
212-
vmImage: macOS-12
215+
vmImage: macOS-latest
213216
os: macOS
214217
templateContext:
215218
outputParentDirectory: $(Build.StagingDirectory)

0 commit comments

Comments
 (0)