From: Daniel Martí <mvdan@mvdan.cc>
Date: Sat, 27 Feb 2016 19:56:32 +0000 (+0000)
Subject: CI: Install Android SDK only if necessary
X-Git-Tag: 0.7.0~99^2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=8106d4ffde0f3c0f56de4db0b08a90af5da5efb6;p=fdroidserver.git

CI: Install Android SDK only if necessary
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1b3148a..9e2470bd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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: