diff --git a/build/ci/.azure-pipelines.yml b/build/ci/.azure-pipelines.yml index 92a084f8ea..ac428f1f6d 100644 --- a/build/ci/.azure-pipelines.yml +++ b/build/ci/.azure-pipelines.yml @@ -66,8 +66,10 @@ stages: # Don't trigger this stage if only docs files are changed condition: ne(dependencies.Determine_Changes.outputs['evaluate_changes.DetermineChanges.docsOnly'], 'true') jobs: - - template: stage-build-uitests-wasm.yml + # Disabled just to speed up the build + # - template: stage-build-uitests-wasm.yml - template: stage-build-uitests-android.yml - - template: stage-build-uitests-ios.yml + # Disabled just to speed up the build + # - template: stage-build-uitests-ios.yml # Disabled waiting on uno fix: https://github.com/unoplatform/uno/pull/17668 # - template: stage-build-runtimetests-skia.yml \ No newline at end of file diff --git a/build/ci/scripts/android-uitest-run.sh b/build/ci/scripts/android-uitest-run.sh index debb532a6a..07012a6679 100644 --- a/build/ci/scripts/android-uitest-run.sh +++ b/build/ci/scripts/android-uitest-run.sh @@ -13,6 +13,7 @@ export UNO_UITEST_ANDROID_PROJECT=$BUILD_SOURCESDIRECTORY/testing/TestHarness/Te export UNO_UITEST_BINARY=$BUILD_SOURCESDIRECTORY/testing/TestHarness/TestHarness.UITest/bin/Release/net47/TestHarness.UITest.dll export UNO_EMULATOR_INSTALLED=$BUILD_SOURCESDIRECTORY/build/.emulator_started export UITEST_TEST_TIMEOUT=60m +export ANDROID_SIMULATOR_APILEVEL=34 # Override Android SDK tooling export ANDROID_HOME=$BUILD_SOURCESDIRECTORY/build/android-sdk @@ -36,15 +37,15 @@ then echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'tools'| tr '\r' '\n' | uniq echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'platform-tools' | tr '\r' '\n' | uniq echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'build-tools;34.0.0' | tr '\r' '\n' | uniq - echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'platforms;android-28' | tr '\r' '\n' | uniq + echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "platforms;android-$ANDROID_SIMULATOR_APILEVEL" | tr '\r' '\n' | uniq echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'platforms;android-34' | tr '\r' '\n' | uniq echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'extras;android;m2repository' | tr '\r' '\n' | uniq # Install AVD files - echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install 'system-images;android-28;google_apis_playstore;x86_64' + echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --sdk_root=${ANDROID_HOME} --install "system-images;android-$ANDROID_SIMULATOR_APILEVEL;google_apis_playstore;x86_64" # Create emulator - echo "no" | $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager create avd -n xamarin_android_emulator --abi "x86_64" -k 'system-images;android-28;google_apis_playstore;x86_64' --force + echo "no" | $ANDROID_HOME/cmdline-tools/latest/bin/avdmanager create avd -n xamarin_android_emulator --abi "x86_64" -k "system-images;android-$ANDROID_SIMULATOR_APILEVEL;google_apis_playstore;x86_64" --force echo $ANDROID_HOME/emulator/emulator -list-avds