devops: fix Android tests (#29335)

This commit is contained in:
Max Schmitt 2024-02-05 20:39:00 +01:00 committed by GitHub
parent bf31f2865f
commit 2690e4c827
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 20 additions and 26 deletions

View File

@ -2,29 +2,29 @@
set -e set -e
SDKDIR=$PWD/.android-sdk if [[ -n "${ANDROID_HOME}" ]]; then
export ANDROID_SDK_ROOT=${SDKDIR} echo "ANDROID_HOME is already set. This script is only for a local installation of the Android SDK."
export ANDROID_HOME=${SDKDIR} exit 1
export ANDROID_AVD_HOME=${SDKDIR}/avd fi
mkdir ${SDKDIR} export ANDROID_HOME="$PWD/.android-sdk"
mkdir ${SDKDIR}/cmdline-tools
mkdir -p ${ANDROID_HOME}/cmdline-tools
echo Downloading Android SDK... echo Downloading Android SDK...
cd ${SDKDIR}/cmdline-tools cd ${ANDROID_HOME}/cmdline-tools
COMMAND_LINE_TOOLS_ZIP=${SDKDIR}/commandlinetools.zip COMMAND_LINE_TOOLS_ZIP=${ANDROID_HOME}/commandlinetools.zip
# https://developer.android.com/studio#command-tools # https://developer.android.com/studio
curl https://dl.google.com/android/repository/commandlinetools-mac-8512546_latest.zip -o ${COMMAND_LINE_TOOLS_ZIP} curl https://dl.google.com/android/repository/commandlinetools-mac-11076708_latest.zip -o ${COMMAND_LINE_TOOLS_ZIP}
unzip ${COMMAND_LINE_TOOLS_ZIP} unzip ${COMMAND_LINE_TOOLS_ZIP}
rm ${COMMAND_LINE_TOOLS_ZIP} rm ${COMMAND_LINE_TOOLS_ZIP}
mv cmdline-tools latest mv cmdline-tools latest
ln -s ${SDKDIR}/cmdline-tools/latest ${SDKDIR}/tools
echo Installing emulator... echo Installing emulator...
yes | ${ANDROID_HOME}/tools/bin/sdkmanager --install platform-tools emulator yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install platform-tools emulator
echo Installing platform SDK... echo Installing platform SDK...
yes | ${ANDROID_HOME}/tools/bin/sdkmanager --install "platforms;android-33" yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-33"
echo Starting ADB... echo Starting ADB...
${ANDROID_HOME}/platform-tools/adb devices ${ANDROID_HOME}/platform-tools/adb devices

View File

@ -3,9 +3,7 @@
set -e set -e
if [[ -z "${ANDROID_HOME}" ]]; then if [[ -z "${ANDROID_HOME}" ]]; then
export SDKDIR=$PWD/.android-sdk export ANDROID_HOME="$PWD/.android-sdk"
export ANDROID_HOME=${SDKDIR}
export ANDROID_SDK_ROOT=${SDKDIR}
fi fi
ANDROID_ARCH="x86_64" ANDROID_ARCH="x86_64"
@ -15,7 +13,7 @@ if [[ "$(uname -m)" == "arm64" ]]; then
ANDROID_ARCH="arm64-v8a" ANDROID_ARCH="arm64-v8a"
fi fi
${ANDROID_HOME}/tools/bin/avdmanager delete avd --name android33 || true ${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager delete avd --name android33 || true
echo "y" | ${ANDROID_HOME}/tools/bin/sdkmanager --install "system-images;android-33;google_apis;$ANDROID_ARCH" yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-33;google_apis;$ANDROID_ARCH" platform-tools emulator
echo "no" | ${ANDROID_HOME}/tools/bin/avdmanager create avd --force --name android33 --device "Nexus 5X" --package "system-images;android-33;google_apis;$ANDROID_ARCH" echo "no" | ${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager create avd --force --name android33 --device "Nexus 5X" --package "system-images;android-33;google_apis;$ANDROID_ARCH"
${ANDROID_HOME}/emulator/emulator -list-avds ${ANDROID_HOME}/emulator/emulator -list-avds

View File

@ -3,9 +3,7 @@
set -e set -e
if [[ -z "${ANDROID_HOME}" ]]; then if [[ -z "${ANDROID_HOME}" ]]; then
SDKDIR=$PWD/.android-sdk export ANDROID_HOME="$PWD/.android-sdk"
export ANDROID_HOME=${SDKDIR}
export ANDROID_SDK_ROOT=${SDKDIR}
fi fi
bash $PWD/utils/avd_stop.sh bash $PWD/utils/avd_stop.sh

View File

@ -3,9 +3,7 @@
set -e set -e
if [[ -z "${ANDROID_HOME}" ]]; then if [[ -z "${ANDROID_HOME}" ]]; then
SDKDIR=$PWD/.android-sdk export ANDROID_HOME="$PWD/.android-sdk"
export ANDROID_HOME=${SDKDIR}
export ANDROID_SDK_ROOT=${SDKDIR}
fi fi
echo "Killing previous emulators" echo "Killing previous emulators"