diff options
| author | Trevor Johns <trevor@sparkledog.net> | 2015-01-30 09:57:00 +1100 |
|---|---|---|
| committer | Trevor Johns <trevor@sparkledog.net> | 2015-01-30 09:57:00 +1100 |
| commit | b3c3ae2a5b41e28c07383644d78e5c076288322f (patch) | |
| tree | ae372c1f3ea7ecfdedf6fb001c9804cc268f36c1 | |
| parent | d7bab489f24cae9d33f84295e0820ebbb3f3ad4c (diff) | |
| parent | b2589fdc1d5476b0f7f08b1a0b80c25de5dcdf23 (diff) | |
| download | iosched-b3c3ae2a5b41e28c07383644d78e5c076288322f.tar.gz | |
Merge pull request #121 from tjohns/ci-server
Update scripts for CI server integration
| -rw-r--r-- | .travis.yml | 16 | ||||
| -rwxr-xr-x | scripts/wait_for_emulator.sh | 4 |
2 files changed, 8 insertions, 12 deletions
diff --git a/.travis.yml b/.travis.yml index e2d90ec..4f16f43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,11 @@ # Copyright 2014 Google Inc. All rights reserved. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,21 +17,17 @@ language: android android: components: - build-tools-21.1.2 - - android-20 - android-21 + - addon-google_apis-google-21 - extra-google-m2repository - extra-android-m2repository - - sys-img-armeabi-v7a-android-21 + - sys-img-armeabi-v7a-addon-google_apis-google-21 notifications: email: false -env: - matrix: - - ANDROID_TARGET=android-21 ANDROID_ABI=armeabi-v7a - before_install: - - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI + - echo no | android create avd --force -n test -t "Google Inc.:Google APIs:21" --abi google_apis/armeabi-v7a - emulator -avd test -no-skin -no-audio -no-window & before_script: diff --git a/scripts/wait_for_emulator.sh b/scripts/wait_for_emulator.sh index 3178838..f0b75c7 100755 --- a/scripts/wait_for_emulator.sh +++ b/scripts/wait_for_emulator.sh @@ -7,11 +7,11 @@ until [[ "$bootanim" =~ "stopped" ]]; do echo "$bootanim" if [[ "$bootanim" =~ "not found" ]]; then let "failcounter += 1" - if [[ $failcounter -gt 3 ]]; then + if [[ $failcounter -gt 6 ]]; then echo "Failed to start emulator" exit 1 fi fi - sleep 1 + sleep 10 done echo "Done" |