diff --git a/.gitignore b/.gitignore index 0c2a6ef..c8e8f19 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ tags .zedstate npm-debug.log /temp +/android-sdk-macosx.zip +/android-sdk-macosx/** diff --git a/.travis.yml b/.travis.yml index a8359ed..aa49de6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,10 @@ language: objective-c os: osx osx_image: xcode9.1 +env: + - TARGET_PLATFORM=android + - TARGET_PLATFORM=ios + cache: directories: - node_modules @@ -19,26 +23,16 @@ before_install: install: - npm install -- brew install gradle -- wget http://dl.google.com/android/android-sdk_r24.4-macosx.zip -- tar -xvf android-sdk_r24.4-macosx.zip -- echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter platform-tools -- echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter build-tools-25.0.0 -- echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter android-25 -- echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-android-support -- echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-android-m2repository -- echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-google-m2repository -- export ANDROID_HOME=$(pwd)/android-sdk-macosx -- export PATH=${PATH}:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/23.0.2 +- if [ $TARGET_PLATFORM = "android" ]; then brew install gradle; fi +- if [ $TARGET_PLATFORM = "android" ]; then scripts/setup-android-sdk.sh; fi +- if [ $TARGET_PLATFORM = "android" ]; then export ANDROID_HOME=$(pwd)/android-sdk-macosx; fi +- if [ $TARGET_PLATFORM = "android" ]; then export PATH=${PATH}:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools/23.0.2; fi script: - npm run testjs -- travis_wait scripts/build-test-app.sh --ios --emulator -- scripts/upload-artifact.sh --ios -- scripts/test-app.sh --ios --emulator -- travis_wait scripts/build-test-app.sh --android --emulator -- scripts/upload-artifact.sh --android -- scripts/test-app.sh --android --emulator +- travis_wait scripts/build-test-app.sh --$TARGET_PLATFORM --emulator +- scripts/upload-artifact.sh --$TARGET_PLATFORM +- scripts/test-app.sh --$TARGET_PLATFORM --emulator after_success: diff --git a/scripts/setup-android-sdk.sh b/scripts/setup-android-sdk.sh new file mode 100755 index 0000000..f100a9a --- /dev/null +++ b/scripts/setup-android-sdk.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env bash +set -e + +curl http://dl.google.com/android/android-sdk_r24.4-macosx.zip -o android-sdk-macosx.zip +tar -xvf android-sdk-macosx.zip + +echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter platform-tools +echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter build-tools-25.0.0 +echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter android-25 +echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-android-support +echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-android-m2repository +echo y | ./android-sdk-macosx/tools/android update sdk --no-ui --all --filter extra-google-m2repository