Merge pull request #18734 from unoplatform/dev/jela/macos-15

fix: Adjust build for macOS 15/14 for the removal of Xcode 16.
unoplatform · Nov 8, 2024 · e621fe4 · e621fe4
2 parents 0e0b086 + c7f84f4
commit e621fe4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -56,10 +56,10 @@ variables:
   windowsScaledPool: 'Windows2022-20240421'
   linuxVMImage: 'ubuntu-latest'
   linuxScaledPool: 'Ubuntu2204-20230918'
-  macOSVMImage: 'macOS-14'
+  macOSVMImage: 'macOS-15'
   macOSVMImage_UITests: 'macOS-14'
   xCodeRoot: '/Applications/Xcode_16.app'
-  xCodeRoot_iOS_UITests: '/Applications/Xcode_16.app'
+  xCodeRoot_iOS_UITests: '/Applications/Xcode_15.3.app'
 
   # Offline validation to improve build performance
   NUGET_CERT_REVOCATION_MODE: offline

diff --git a/build/ci/.azure-devops-android-tests.yml b/build/ci/.azure-devops-android-tests.yml
@@ -36,6 +36,11 @@ jobs:
   - checkout: self
     clean: true
 
+  # Install android 34 as we're running on macos-15
+  - bash: |
+      echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'platforms;android-34' | tr '\r' '\n' | uniq
+    displayName: Install Android 34
+
   - template: templates/dotnet-mobile-install-mac.yml
 
   - template: templates/nuget-cache.yml

diff --git a/build/ci/.azure-devops-project-template-tests.yml b/build/ci/.azure-devops-project-template-tests.yml
@@ -83,6 +83,11 @@ jobs:
     inputs:
       artifactName: 'Nuget_Packages'
 
+  # Install android 34 as we're running on macos-15
+  - bash: |
+      echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=$ANDROID_HOME --install 'platforms;android-34' | tr '\r' '\n' | uniq
+    displayName: Install Android 34
+
   - template: templates/gitversion.yml
 
   - template: templates/ios-build-select-version.yml