Skip to content

Commit 0ccdc57

Browse files
committedJan 8, 2025·
[ci] Upgrade on-prem macOS pool to macOS-14 Sonoma (#9477)
Build and test stages using the physical macOS pool have been updated to use macOS-14 Sonoma images, and builds will now prefer Apple silicon over Intel machines.

File tree

6 files changed

+22
-16
lines changed

6 files changed

+22
-16
lines changed
 

‎build-tools/automation/azure-pipelines-apidocs.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ stages:
5858
- job: mac_build_update_docs
5959
displayName: Update API Docs
6060
pool:
61-
name: VSEng-VSMac-Xamarin-Shared
61+
name: $(SharedMacPool)
6262
demands:
63-
- macOS.Name -equals Ventura
64-
- macOS.Architecture -equals x64
63+
- macOS.Name -equals $(SharedMacName)
64+
- Agent.OSArchitecture -equals $(SharedMacArch)
6565
timeoutInMinutes: 120
6666
workspace:
6767
clean: all

‎build-tools/automation/azure-pipelines-nightly.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ stages:
4141
- job: mac_build_create_installers
4242
displayName: macOS > Create Installers
4343
pool:
44-
name: VSEng-VSMac-Xamarin-Shared
44+
name: $(SharedMacPool)
4545
demands:
46-
- macOS.Name -equals Ventura
47-
- macOS.Architecture -equals x64
46+
- macOS.Name -equals $(SharedMacName)
47+
- Agent.OSArchitecture -equals $(SharedMacArch)
4848
timeoutInMinutes: 420
4949
workspace:
5050
clean: all
@@ -185,9 +185,9 @@ stages:
185185
strategy:
186186
parallel: 3
187187
pool:
188-
name: VSEng-VSMac-Xamarin-Shared
188+
name: $(SharedMacPool)
189189
demands:
190-
- macOS.Name -equals Ventura
190+
- macOS.Name -equals $(SharedMacName)
191191
- macOS.Architecture -equals x64
192192
timeoutInMinutes: 120
193193
workspace:
@@ -241,9 +241,9 @@ stages:
241241
strategy:
242242
parallel: 6
243243
pool:
244-
name: VSEng-VSMac-Xamarin-Shared
244+
name: $(SharedMacPool)
245245
demands:
246-
- macOS.Name -equals Ventura
246+
- macOS.Name -equals $(SharedMacName)
247247
- macOS.Architecture -equals x64
248248
timeoutInMinutes: 150
249249
workspace:

‎build-tools/automation/yaml-templates/build-macos.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ stages:
2929
displayName: ${{ parameters.jobDisplayName }}
3030
pool:
3131
${{ if or(eq(variables['Build.DefinitionName'], 'Xamarin.Android-PR'), eq(variables['Build.DefinitionName'], 'Xamarin.Android Nightly')) }}:
32-
name: VSEng-VSMac-Xamarin-Shared
32+
name: $(SharedMacPool)
3333
demands:
34-
- macOS.Name -equals Ventura
35-
- macOS.Architecture -equals x64
34+
- macOS.Name -equals $(SharedMacName)
35+
- Agent.OSArchitecture -equals $(SharedMacArch)
3636
${{ else }}:
3737
name: Azure Pipelines
3838
vmImage: $(HostedMacImage)

‎build-tools/automation/yaml-templates/run-emulator-tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ jobs:
1212
- job: mac_${{ parameters.jobName }}_tests
1313
displayName: ${{ parameters.jobName }} Emulator Tests
1414
pool:
15-
name: VSEng-VSMac-Xamarin-Shared
15+
name: $(SharedMacPool)
1616
demands:
17-
- macOS.Name -equals Ventura
17+
- macOS.Name -equals $(SharedMacName)
1818
- macOS.Architecture -equals x64
1919
timeoutInMinutes: ${{ parameters.jobTimeout }}
2020
workspace:

‎build-tools/automation/yaml-templates/run-msbuild-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
${{ if eq(parameters.testOS, 'macOS') }}:
2424
pool:
2525
name: Azure Pipelines
26-
vmImage: $(HostedMacImage)
26+
image: $(HostedMacImage)
2727
os: macOS
2828
timeoutInMinutes: 240
2929
cancelTimeoutInMinutes: 5

‎build-tools/automation/yaml-templates/variables.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ variables:
3131
value: $(github--pat--vs-mobiletools-engineering-service2)
3232
- name: HostedMacImage
3333
value: macOS-14
34+
- name: SharedMacPool
35+
value: VSEng-VSMac-Xamarin-Shared
36+
- name: SharedMacName
37+
value: Sonoma
38+
- name: SharedMacArch
39+
value: arm64
3440
- name: HostedWinImage
3541
value: windows-2022
3642
- name: WindowsPoolImage1ESPT

0 commit comments

Comments
 (0)