8000 fix deploy (#217) · optimizely/android-sdk@80a89c8 · GitHub
[go: up one dir, main page]
Skip to content

Commit 80a89c8

Browse files
thomaszurkan-optimizelythomaszurkan-optimizely
authored
fix deploy (#217)
* fix deploy * try running multiple emulators * get api 27 going * get api 27 running * try api 26 * try and run with api 26 * get newer emulator working * trying to get api 26 running on travis * trying to get api 26 running on travis * use api24 * remove exta emulator call * just want to get two builds working * parallel builds for android * just run api 21 and 22 * remove unused comments. add comments * cleanup
1 parent 8cf57c9 commit 80a89c8

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

‎.travis.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@ language: android
22
env:
33
global:
44
# These parameters should match the parameters for build tools and sdk versions in the gradle file
5-
- ANDROID_API=26
6-
- EMULATOR_API=21
7-
- ANDROID_BUILD_TOOLS=27.0.0
5+
- ANDROID_BUILD_TOOLS=27.0.0 # should match gradle
86
- ADB_INSTALL_TIMEOUT=5 # minutes
7+
- ANDROID_API=26 # api is same as gradle file
8+
matrix:
9+
- EMULATOR_API=22
10+
- EMULATOR_API=21
911
android:
1012
components:
1113
- tools
1214
- platform-tools
15+
- tools
1316
- build-tools-$ANDROID_BUILD_TOOLS
1417
- android-$ANDROID_API
1518
- android-$EMULATOR_API
@@ -18,7 +21,7 @@ android:
1821
- addon-google_apis-google-19 # google play services
1922
- sys-img-armeabi-v7a-addon-google_apis-google-$ANDROID_API
2023
- sys-img-armeabi-v7a-addon-google_apis-google-$EMULATOR_API
21-
- sys-img-armeabi-v7a-android-21
24+
- sys-img-armeabi-v7a-android-$EMULATOR_API
2225
licenses:
2326
- android-sdk-preview-license-.+
2427
- android-sdk-license-.+
@@ -34,7 +37,7 @@ cache:
3437
before_script:
3538
- echo $TRAVIS_BRANCH
3639
- echo $TRAVIS_TAG
37-
- echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
40+
- echo no | android create avd --force -n test -t android-$EMULATOR_API --abi armeabi-v7a
3841
- emulator -avd test -no-audio -no-window &
3942
- android-wait-for-emulator
4043
- adb shell input keyevent 82 &

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
buildscript {
2020
def bintray_user = System.getenv('BINTRAY_USER')
2121
def bintray_api_key = System.getenv('BINTRAY_API_KEY')
22-
def version_name = System.getenv('CIRCLE_TAG')
22+
def version_name = System.getenv('TRAVIS_TAG')
2323
if (bintray_user != null && bintray_api_key != null && version_name != null) {
2424
rootProject.ext.bintray_user = bintray_user
2525
rootProject.ext.bintray_api_key = bintray_api_key

0 commit comments

Comments
 (0)
0