Skip to content

fix deploy #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Aug 8, 2018
Merged

fix deploy #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fbed484
fix deploy
thomaszurkan-optimizely Aug 8, 2018
d7fbe9d
try running multiple emulators
thomaszurkan-optimizely Aug 8, 2018
634386e
get api 27 going
thomaszurkan-optimizely Aug 8, 2018
8886624
get api 27 running
thomaszurkan-optimizely Aug 8, 2018
40c00ff
try api 26
thomaszurkan-optimizely Aug 8, 2018
0e1cd65
try and run with api 26
thomaszurkan-optimizely Aug 8, 2018
eb21ec4
get newer emulator working
thomaszurkan-optimizely Aug 8, 2018
865eefc
trying to get api 26 running on travis
thomaszurkan-optimizely Aug 8, 2018
747a8b6
trying to get api 26 running on travis
thomaszurkan-optimizely Aug 8, 2018
7c750d7
use api24
thomaszurkan-optimizely Aug 8, 2018
07ccc98
remove exta emulator call
thomaszurkan-optimizely Aug 8, 2018
1f90fa4
just want to get two builds working
thomaszurkan-optimizely Aug 8, 2018
b9aacfc
parallel builds for android
thomaszurkan-optimizely Aug 8, 2018
22eef44
just run api 21 and 22
thomaszurkan-optimizely Aug 8, 2018
111a7ec
remove unused comments. add comments
thomaszurkan-optimizely Aug 8, 2018
5efe40c
cleanup
thomaszurkan-optimizely Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@ language: android
env:
global:
# These parameters should match the parameters for build tools and sdk versions in the gradle file
- ANDROID_API=26
- EMULATOR_API=21
- ANDROID_BUILD_TOOLS=27.0.0
- ANDROID_BUILD_TOOLS=27.0.0 # should match gradle
- ADB_INSTALL_TIMEOUT=5 # minutes
- ANDROID_API=26 # api is same as gradle file
matrix:
- EMULATOR_API=22
- EMULATOR_API=21
android:
components:
- tools
- platform-tools
- tools
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed twice?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

apparently, it is a travis thing:
https://docs.travis-ci.com/user/languages/android/

- build-tools-$ANDROID_BUILD_TOOLS
- android-$ANDROID_API
- android-$EMULATOR_API
Expand All @@ -18,7 +21,7 @@ android:
- addon-google_apis-google-19 # google play services
- sys-img-armeabi-v7a-addon-google_apis-google-$ANDROID_API
- sys-img-armeabi-v7a-addon-google_apis-google-$EMULATOR_API
- sys-img-armeabi-v7a-android-21
- sys-img-armeabi-v7a-android-$EMULATOR_API
licenses:
- android-sdk-preview-license-.+
- android-sdk-license-.+
Expand All @@ -34,7 +37,7 @@ cache:
before_script:
- echo $TRAVIS_BRANCH
- echo $TRAVIS_TAG
- echo no | android create avd --force -n test -t android-21 --abi armeabi-v7a
- echo no | android create avd --force -n test -t android-$EMULATOR_API --abi armeabi-v7a
- emulator -avd test -no-audio -no-window &
- android-wait-for-emulator
- adb shell input keyevent 82 &
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
buildscript {
def bintray_user = System.getenv('BINTRAY_USER')
def bintray_api_key = System.getenv('BINTRAY_API_KEY')
def version_name = System.getenv('CIRCLE_TAG')
def version_name = System.getenv('TRAVIS_TAG')
if (bintray_user != null && bintray_api_key != null && version_name != null) {
rootProject.ext.bintray_user = bintray_user
rootProject.ext.bintray_api_key = bintray_api_key
Expand Down