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.

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

fix: Adjust for missing symbols when running on macOS 10.14 #6343

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 12 additions & 7 deletions build/android-uitest-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ set -euo pipefail
IFS=$'\n\t'

export BUILDCONFIGURATION=Release
export ANDROID_HOME=$BUILD_SOURCESDIRECTORY/build/android-sdk

cd $BUILD_SOURCESDIRECTORY/build

mkdir android-sdk
pushd android-sdk
# URL from https://developer.android.com/studio/index.html#command-tools
wget https://dl.google.com/android/repository/commandlinetools-mac-6200805_latest.zip
unzip commandlinetools-mac-6200805_latest.zip
popd
# This block allows to override the Android SDK
# disabled until hosted agents move to macOS 11
#
# export ANDROID_HOME=$BUILD_SOURCESDIRECTORY/build/android-sdk
#wget https://dl.google.com/android/repository/commandlinetools-mac-7302050_latest.zip
#unzip commandlinetools-mac-7302050_latest.zip
#rm commandlinetools-mac-7302050_latest.zip
#mkdir -p $ANDROID_HOME/cmdline-tools/latest
#cp -R cmdline-tools/ $ANDROID_HOME/sdk/cmdline-tools/latest/

# uncomment the following lines to override the installed Xamarin.Android SDK
# wget -nv https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android-d16-2/49/Azure/processDownloadRequest/xamarin-android/xamarin-android/bin/BuildRelease/Xamarin.Android.Sdk-OSS-9.4.0.59_d16-2_6d9b105.pkg
Expand Down Expand Up @@ -67,6 +69,9 @@ source $BUILD_SOURCESDIRECTORY/build/android-uitest-wait-systemui.sh
# list active devices
$ANDROID_HOME/platform-tools/adb devices

# Workaround for https://github.com/microsoft/appcenter/issues/1451
$ANDROID_HOME/platform-tools/adb shell settings put global hidden_api_policy 1

echo "Emulator started"

if [ "$UITEST_TEST_MODE_NAME" == 'Snapshots' ];
Expand Down
2 changes: 1 addition & 1 deletion build/ci/.azure-devops-ios-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ jobs:
nugetPackages: $(NUGET_PACKAGES)
JobName: 'iOS_Automated_Tests_Runtime_Tests'
JobDisplayName: 'iOS Automated Runtime Tests'
JobTimeoutInMinutes: 40
JobTimeoutInMinutes: 60
vmImage: ${{ parameters.vmImage }}
UITEST_SNAPSHOTS_ONLY: false
UITEST_AUTOMATED_GROUP: 4
Expand Down