From 75d660cbf7e9d37d138da790922562f447fe318d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Thu, 14 Nov 2024 08:27:43 -0500 Subject: [PATCH] chore: Install android sdk on macos --- build/.azure-pipelines.yml | 2 +- build/templates/package-validation.yml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/build/.azure-pipelines.yml b/build/.azure-pipelines.yml index 136df6984..88da7195b 100644 --- a/build/.azure-pipelines.yml +++ b/build/.azure-pipelines.yml @@ -19,7 +19,7 @@ pr: variables: DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true IsCanaryBranch: $[startsWith(variables['Build.SourceBranch'], 'refs/heads/canaries/')] - ValidationUnoCheckVersion: '1.26.0-dev.65' + ValidationUnoCheckVersion: '1.27.0' ValidationDotNetVersion: '8.0.401' # https://github.com/unoplatform/Uno.Wasm.Bootstrap/pull/887 remove when upgarding to .NET 9 diff --git a/build/templates/package-validation.yml b/build/templates/package-validation.yml index 685995442..31b6e1020 100644 --- a/build/templates/package-validation.yml +++ b/build/templates/package-validation.yml @@ -55,6 +55,13 @@ steps: displayName: OpenJDK (Linux) condition: eq(variables['Agent.OS'], 'Linux') +# 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 'build-tools;35.0.0' | 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 + displayName: Install Android 34 + condition: eq(variables['Agent.OS'], 'Darwin') + - powershell: | & dotnet tool install --global Uno.Check --version $env:ValidationUnoCheckVersion uno-check -v --ci --non-interactive --fix --skip androidemulator --skip dotnetnewunotemplates ${{ parameters.unocheckArguments }}