diff options
| -rw-r--r-- | .travis.yml | 20 | ||||
| -rwxr-xr-x | scripts/travis_script.sh | 11 |
2 files changed, 17 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index cd43772a89..bdb2cfd20d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,11 @@ matrix: - os: linux include: - os: linux - env: BUILDTYPE=Release JOBS=16 MASON_PLATFORM=android + env: BUILDTYPE=Release JOBS=16 MASON_PLATFORM=android TESTMUNK=yes + compiler: clang + - os: linux + env: BUILDTYPE=Debug JOBS=16 MASON_PLATFORM=android TESTMUNK=no compiler: clang -# - os: linux -# env: BUILDTYPE=Debug JOBS=16 MASON_PLATFORM=android -# compiler: clang - os: linux env: BUILDTYPE=Release JOBS=16 compiler: clang @@ -22,12 +22,12 @@ matrix: - os: linux env: BUILDTYPE=Debug JOBS=8 compiler: gcc -# - os: osx -# env: BUILDTYPE=Release JOBS=8 MASON_PLATFORM=android -# compiler: clang -# - os: osx -# env: BUILDTYPE=Debug JOBS=8 MASON_PLATFORM=android -# compiler: clang + - os: osx + env: BUILDTYPE=Release JOBS=8 MASON_PLATFORM=android TESTMUNK=no + compiler: clang + - os: osx + env: BUILDTYPE=Debug JOBS=8 MASON_PLATFORM=android TESTMUNK=no + compiler: clang - os: osx env: BUILDTYPE=Release JOBS=8 compiler: clang diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index 316d124017..6fc9edd92b 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -9,10 +9,13 @@ git submodule update --init styles if [[ $MASON_PLATFORM == "android" ]]; then mapbox_time "compile_program" \ make android -j$JOBS BUILDTYPE=${BUILDTYPE} - - mapbox_time_start "upload_testmunk" - (cd ./android/test/ && ./upload_testmunk.sh ../java/app/build/outputs/apk/app-debug.apk) - mapbox_time_finish + + if [[ $TESTMUNK == "yes" ]]; then + mapbox_time_start "upload_testmunk" + (cd ./android/test/ && ./upload_testmunk.sh ../java/app/build/outputs/apk/app-debug.apk) + mapbox_time_finish + fi + elif [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # # build & test Linux |