From a1f40bad0ebe130f639f096517f8d586579d3568 Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Thu, 9 Jan 2025 13:03:36 -0500 Subject: [PATCH 1/5] ci: bump ci to macos-15 --- build/workflow/stage-build-ios.yml | 4 ++-- build/workflow/stage-uitests-android.yml | 2 +- build/workflow/stage-uitests-ios.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/workflow/stage-build-ios.yml b/build/workflow/stage-build-ios.yml index 12bcbddf5..94aca26e3 100644 --- a/build/workflow/stage-build-ios.yml +++ b/build/workflow/stage-build-ios.yml @@ -20,7 +20,7 @@ jobs: CI_Build: true pool: - vmImage: 'macOS-14' + vmImage: 'macOS-15' variables: - group: unoplatform.apple.ios.appstore.distribution @@ -119,7 +119,7 @@ jobs: CI_Build: true pool: - vmImage: 'macOS-14' + vmImage: 'macOS-15' steps: - template: templates/dotnet-workload-install-mac.yml diff --git a/build/workflow/stage-uitests-android.yml b/build/workflow/stage-uitests-android.yml index 18025ae1c..cf467e3c6 100644 --- a/build/workflow/stage-uitests-android.yml +++ b/build/workflow/stage-uitests-android.yml @@ -43,7 +43,7 @@ SAMPLEAPP_PACKAGE_NAME: uno.platform.toolkit pool: - vmImage: 'macOS-14' + vmImage: 'macOS-15' steps: - checkout: self diff --git a/build/workflow/stage-uitests-ios.yml b/build/workflow/stage-uitests-ios.yml index 46c30e969..da00dd790 100644 --- a/build/workflow/stage-uitests-ios.yml +++ b/build/workflow/stage-uitests-ios.yml @@ -36,7 +36,7 @@ SAMPLEAPP_ARTIFACT_NAME: ios-winui-uitest-build pool: - vmImage: 'macOS-14' + vmImage: 'macOS-15' steps: - checkout: self From dff3c7ea16731ef2d84d38563350e68e795bcd9e Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Thu, 9 Jan 2025 13:16:50 -0500 Subject: [PATCH 2/5] ci: fixes --- build/workflow/stage-build-ios.yml | 4 +--- build/workflow/stage-uitests-android.yml | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/build/workflow/stage-build-ios.yml b/build/workflow/stage-build-ios.yml index 94aca26e3..73cab5fb6 100644 --- a/build/workflow/stage-build-ios.yml +++ b/build/workflow/stage-build-ios.yml @@ -20,7 +20,7 @@ jobs: CI_Build: true pool: - vmImage: 'macOS-15' + vmImage: 'macOS-14' variables: - group: unoplatform.apple.ios.appstore.distribution @@ -124,8 +124,6 @@ jobs: 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-android.yml b/build/workflow/stage-uitests-android.yml index cf467e3c6..18025ae1c 100644 --- a/build/workflow/stage-uitests-android.yml +++ b/build/workflow/stage-uitests-android.yml @@ -43,7 +43,7 @@ SAMPLEAPP_PACKAGE_NAME: uno.platform.toolkit pool: - vmImage: 'macOS-15' + vmImage: 'macOS-14' steps: - checkout: self From fc2f323111402c2ea0f265c1da50f9f45558f6fd Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Thu, 9 Jan 2025 16:12:26 -0500 Subject: [PATCH 3/5] chore: fix --- build/workflow/pipeline.yml | 1 + build/workflow/stage-uitests-ios.yml | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build/workflow/pipeline.yml b/build/workflow/pipeline.yml index acea2f1c6..81d052603 100644 --- 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/stage-uitests-ios.yml b/build/workflow/stage-uitests-ios.yml index da00dd790..a354145a2 100644 --- a/build/workflow/stage-uitests-ios.yml +++ b/build/workflow/stage-uitests-ios.yml @@ -36,7 +36,7 @@ SAMPLEAPP_ARTIFACT_NAME: ios-winui-uitest-build pool: - vmImage: 'macOS-15' + vmImage: 'macOS-14' steps: - checkout: self @@ -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 From e914a377796b6245440443a104ba6994b3843a02 Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Thu, 9 Jan 2025 21:47:11 -0500 Subject: [PATCH 4/5] ci: fix build --- build/workflow/templates/xcode-select.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 build/workflow/templates/xcode-select.yml diff --git a/build/workflow/templates/xcode-select.yml b/build/workflow/templates/xcode-select.yml new file mode 100644 index 000000000..4374ebf07 --- /dev/null +++ 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 \ No newline at end of file From 38ca74b9580faec3aea662dfb36a8a7e8bf25df8 Mon Sep 17 00:00:00 2001 From: Steve Bilogan Date: Fri, 10 Jan 2025 08:49:29 -0500 Subject: [PATCH 5/5] ci: change sim --- build/workflow/scripts/ios-uitest-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/workflow/scripts/ios-uitest-run.sh b/build/workflow/scripts/ios-uitest-run.sh index 99b1c60c6..cc592a000 100644 --- 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