1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-08-16 03:10:09 +02:00

Merge branch 'faster-ci' into 'master'

CI: Install Android SDK only if necessary



See merge request !106
This commit is contained in:
Daniel Martí 2016-02-28 13:35:57 +00:00
commit 9f95c0bbdb

View File

@ -14,18 +14,17 @@ before_script:
- apt-get -q install -y python-dev libjpeg-dev zlib1g-dev
- echo " == Installing OpenJDK 7"
- apt-get -q install -y openjdk-7-jdk
- echo " == Installing packages required by the 32-bit SDK"
- apt-get -q install -y lib32stdc++6 lib32z1
- echo " == Installing the Android SDK"
- wget -q -O android-sdk.tgz https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
- tar -x -z -f android-sdk.tgz
- mv android-sdk-linux android-sdk
- export ANDROID_HOME=$PWD/android-sdk
- export PATH="$ANDROID_HOME/tools:$PATH"
- echo " == Installing Android SDK components"
- echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.2
- export PATH="$ANDROID_HOME/platform-tools:$PATH"
- export PATH="$ANDROID_HOME/build-tools/23.0.2:$PATH"
- test -z "$ANDROID_HOME" &&
echo " == Installing Android SDK" &&
apt-get -q install -y lib32stdc++6 lib32z1 &&
wget -q -O android-sdk.tgz https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz &&
tar -xzf android-sdk.tgz &&
export ANDROID_HOME=$PWD/android-sdk-linux &&
export PATH="$ANDROID_HOME/tools:$PATH" &&
echo y | android -s update sdk --no-ui -a -t platform-tools,tools,build-tools-23.0.2 &&
export PATH="$ANDROID_HOME/platform-tools:$PATH" &&
export PATH="$ANDROID_HOME/build-tools/23.0.2:$PATH" &&
echo y | android -s update sdk --no-ui -a -t android-10
test:
script: