ci: bump ci to macos-15 (#1321)

unoplatform · Jan 10, 2025 · 515d675 · 515d675
1 parent c85cdd0
commit 515d675
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/build/workflow/pipeline.yml b/build/workflow/pipeline.yml
@@ -36,6 +36,7 @@ variables:
 
   IsCanaryBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/')]
   IsReleaseBranch: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/feature/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))]
+  XCODE_ROOT: '/Applications/Xcode_15.4.app'
 
 stages:
 - stage: Determine_Changes

diff --git a/build/workflow/scripts/ios-uitest-run.sh b/build/workflow/scripts/ios-uitest-run.sh
@@ -25,7 +25,7 @@ export UNO_ORIGINAL_TEST_RESULTS=$BUILD_SOURCESDIRECTORY/build/$UNO_TEST_RESULTS
 export UNO_UITEST_RUNTIMETESTS_RESULTS_FILE_PATH=$UNO_ORIGINAL_TEST_RESULTS
 export UNO_TESTS_RESPONSE_FILE=$BUILD_SOURCESDIRECTORY/build/nunit.response
 export UNO_UITEST_SIMULATOR_VERSION="com.apple.CoreSimulator.SimRuntime.iOS-17-5"
-export UNO_UITEST_SIMULATOR_NAME="iPad Pro (12.9-inch) (6th generation)"
+export UNO_UITEST_SIMULATOR_NAME="iPad (10th generation)"
 
 export UITEST_TEST_TIMEOUT=120m
 

diff --git a/build/workflow/stage-build-ios.yml b/build/workflow/stage-build-ios.yml
@@ -119,13 +119,11 @@ jobs:
         CI_Build: true
 
   pool:
-    vmImage: 'macOS-14'
+    vmImage: 'macOS-15'
 
   steps:
   - template: templates/dotnet-workload-install-mac.yml
   - template: templates/canary-updater.yml
-  - template: templates/gitversion.yml
-  - template: templates/set-app-versions.yml
 
   - bash: |
       chmod +x $(build.sourcesdirectory)/build/workflow/scripts/ios-uitest-build.sh

diff --git a/build/workflow/stage-uitests-ios.yml b/build/workflow/stage-uitests-ios.yml
@@ -51,6 +51,10 @@
   - template: templates/dotnet-workload-install-mac.yml
   - template: templates/canary-updater.yml
 
+  - template: templates/xcode-select.yml
+    parameters:
+      xCodeRoot: $(XCODE_ROOT)
+
   - bash: |
       chmod +x $(build.sourcesdirectory)/build/workflow/scripts/ios-uitest-run.sh
       $(build.sourcesdirectory)/build/workflow/scripts/ios-uitest-run.sh

diff --git a/build/workflow/templates/xcode-select.yml b/build/workflow/templates/xcode-select.yml
@@ -0,0 +1,10 @@
+parameters:
+  xCodeRoot: ''
+
+steps:
+  - bash: |
+      echo 'Xcode Root to ${{parameters.xCodeRoot}}'
+      echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'${{parameters.xCodeRoot}}
+      sudo xcode-select --switch ${{parameters.xCodeRoot}}/Contents/Developer
+
+    displayName: Select Xcode