From 1153a934252c12fb83f2ce9fefc54799d54561d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 24 Feb 2016 20:27:20 +0000 Subject: [PATCH 1/2] CI: Remove kill line Hans correctly pointed out all this does is try to kill the echo. The AVD should be taken down along with the docker runner. --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7a2d3041..f88bd603b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,5 +33,3 @@ test: - adb shell input keyevent 82 - echo " == Running Android tests on the 2.3.7 emulator" - ADB_INSTALL_TIMEOUT=8 ./gradlew connectedCheck || { adb logcat -d '*:W'; exit 1; } - - echo " == Stopping Android 2.3.7 emulator" - - kill $! From 86ecfa217f68fda33f9b31b7e591297d67bc91bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 24 Feb 2016 20:31:30 +0000 Subject: [PATCH 2/2] CI: Simplify sdk unboxing --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f88bd603b..f7a4cffd5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,9 +8,8 @@ before_script: - 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 + - tar -xzf android-sdk.tgz + - export ANDROID_HOME=$PWD/android-sdk-linux - 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,android-22,extra-android-m2repository