chore: macos-14 for sims, macos-15 for builds

unoplatform · Nov 7, 2024 · 2ba7cb8 · 2ba7cb8
1 parent a319943
commit 2ba7cb8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -43,6 +43,7 @@ variables:
   IsCanaryBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/')]
 
   XCODE_ROOT: '/Applications/Xcode_16.app'
+  XCODE_ROOT_UITESTS: '/Applications/Xcode_15.3.app'
 
   # Required to about trashing azdo hosted agents
   AotCompileMaxDegreeOfParallelism: 2

diff --git a/build/stage-uitests-ios.yml b/build/stage-uitests-ios.yml
@@ -6,7 +6,7 @@
     SourceLinkEnabled: false
 
   pool:
-    vmImage: 'macos-14'
+    vmImage: 'macos-15'
 
   steps:
   - checkout: self
@@ -51,6 +51,7 @@
     SourceLinkEnabled: false
 
   pool:
+    # Keep an older version to avoid https://github.com/actions/runner-images/issues/10925
     vmImage: 'macos-14'
 
   steps:
@@ -59,7 +60,7 @@
 
   - template: templates/xcode-select.yml
     parameters:
-      xCodeRoot: $(XCODE_ROOT)
+      xCodeRoot: $(XCODE_ROOT_UITEST)
 
   - download: current
     artifact: iOS_UITest