Skip to content

Commit

Permalink
[ci] Move PR build to shared pool (#8854)
Browse files Browse the repository at this point in the history
Removes our dependency on the Android specific build pool, which should
reduce overall pool maintenance effort and cost.

The `VSEng-VSMac-Xamarin-Shared` pool is used by a handful of teams and
also consists of physical macOS machines that should be more performant
than the hosted options.
  • Loading branch information
pjcollins authored Jul 2, 2024
1 parent 4127db7 commit d1ccddc
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
6 changes: 4 additions & 2 deletions build-tools/automation/azure-pipelines-apidocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,10 @@ stages:
- job: mac_build_update_docs
displayName: Update API Docs
pool:
name: VSEng-Xamarin-RedmondMac-Android-Untrusted
demands: macOS.Name -equals Monterey
name: VSEng-VSMac-Xamarin-Shared
demands:
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
timeoutInMinutes: 120
workspace:
clean: all
Expand Down
6 changes: 4 additions & 2 deletions build-tools/automation/azure-pipelines-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ stages:
- job: mac_build_create_installers
displayName: macOS > Create Installers
pool:
name: VSEng-Xamarin-RedmondMac-Android-Untrusted
demands: macOS.Name -equals Monterey
name: VSEng-VSMac-Xamarin-Shared
demands:
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
timeoutInMinutes: 420
workspace:
clean: all
Expand Down
6 changes: 4 additions & 2 deletions build-tools/automation/yaml-templates/build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ stages:
displayName: ${{ parameters.jobDisplayName }}
pool:
${{ if or(eq(variables['Build.DefinitionName'], 'Xamarin.Android-PR'), eq(variables['Build.DefinitionName'], 'Xamarin.Android Nightly')) }}:
name: VSEng-Xamarin-RedmondMac-Android-Untrusted
demands: macOS.Name -equals Monterey
name: VSEng-VSMac-Xamarin-Shared
demands:
- macOS.Name -equals Ventura
- macOS.Architecture -equals x64
${{ else }}:
name: Azure Pipelines
vmImage: $(HostedMacImage)
Expand Down

0 comments on commit d1ccddc

Please sign in to comment.