Skip to content

Commit 515d675

Browse files
authored
ci: bump ci to macos-15 (#1321)
1 parent c85cdd0 commit 515d675

File tree

5 files changed

+17
-4
lines changed

5 files changed

+17
-4
lines changed

build/workflow/pipeline.yml

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ variables:
3636

3737
IsCanaryBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/')]
3838
IsReleaseBranch: $[or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), startsWith(variables['Build.SourceBranch'], 'refs/heads/feature/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'))]
39+
XCODE_ROOT: '/Applications/Xcode_15.4.app'
3940

4041
stages:
4142
- stage: Determine_Changes

build/workflow/scripts/ios-uitest-run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export UNO_ORIGINAL_TEST_RESULTS=$BUILD_SOURCESDIRECTORY/build/$UNO_TEST_RESULTS
2525
export UNO_UITEST_RUNTIMETESTS_RESULTS_FILE_PATH=$UNO_ORIGINAL_TEST_RESULTS
2626
export UNO_TESTS_RESPONSE_FILE=$BUILD_SOURCESDIRECTORY/build/nunit.response
2727
export UNO_UITEST_SIMULATOR_VERSION="com.apple.CoreSimulator.SimRuntime.iOS-17-5"
28-
export UNO_UITEST_SIMULATOR_NAME="iPad Pro (12.9-inch) (6th generation)"
28+
export UNO_UITEST_SIMULATOR_NAME="iPad (10th generation)"
2929

3030
export UITEST_TEST_TIMEOUT=120m
3131

build/workflow/stage-build-ios.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,11 @@ jobs:
119119
CI_Build: true
120120

121121
pool:
122-
vmImage: 'macOS-14'
122+
vmImage: 'macOS-15'
123123

124124
steps:
125125
- template: templates/dotnet-workload-install-mac.yml
126126
- template: templates/canary-updater.yml
127-
- template: templates/gitversion.yml
128-
- template: templates/set-app-versions.yml
129127

130128
- bash: |
131129
chmod +x $(build.sourcesdirectory)/build/workflow/scripts/ios-uitest-build.sh

build/workflow/stage-uitests-ios.yml

+4
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
- template: templates/dotnet-workload-install-mac.yml
5252
- template: templates/canary-updater.yml
5353

54+
- template: templates/xcode-select.yml
55+
parameters:
56+
xCodeRoot: $(XCODE_ROOT)
57+
5458
- bash: |
5559
chmod +x $(build.sourcesdirectory)/build/workflow/scripts/ios-uitest-run.sh
5660
$(build.sourcesdirectory)/build/workflow/scripts/ios-uitest-run.sh
+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
parameters:
2+
xCodeRoot: ''
3+
4+
steps:
5+
- bash: |
6+
echo 'Xcode Root to ${{parameters.xCodeRoot}}'
7+
echo '##vso[task.setvariable variable=MD_APPLE_SDK_ROOT;]'${{parameters.xCodeRoot}}
8+
sudo xcode-select --switch ${{parameters.xCodeRoot}}/Contents/Developer
9+
10+
displayName: Select Xcode

0 commit comments

Comments
 (0)