Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 12, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions build/workflow/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/workflow/scripts/ios-uitest-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 1 addition & 3 deletions build/workflow/stage-build-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions build/workflow/stage-uitests-ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@
artifactName: $(SAMPLEAPP_ARTIFACT_NAME)
downloadPath: '$(build.sourcesdirectory)/build'

- 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
Expand Down
10 changes: 10 additions & 0 deletions build/workflow/templates/xcode-select.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading