diff options
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rwxr-xr-x | android/scripts/build-debug.sh | 2 | ||||
| -rwxr-xr-x | android/scripts/build-release.sh | 2 | ||||
| -rwxr-xr-x | android/scripts/common.sh | 4 | ||||
| -rwxr-xr-x | android/scripts/run-build.sh | 9 | ||||
| -rwxr-xr-x | scripts/travis_before_install.sh | 81 | ||||
| -rwxr-xr-x | scripts/travis_script.sh | 11 |
7 files changed, 17 insertions, 100 deletions
diff --git a/.travis.yml b/.travis.yml index 5049a4e32d..a26393969c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,10 +5,10 @@ matrix: - os: linux include: - os: linux - env: BUILDTYPE=Release MASON_PLATFORM=android TESTMUNK=yes + env: CONFIG=release MASON_PLATFORM=android TESTMUNK=yes compiler: clang - os: linux - env: BUILDTYPE=Debug MASON_PLATFORM=android TESTMUNK=no + env: CONFIG=debug MASON_PLATFORM=android TESTMUNK=no compiler: clang - os: linux env: BUILDTYPE=Release JOBS=16 @@ -39,10 +39,6 @@ before_install: - source ./scripts/local_mason.sh - source ./scripts/travis_helper.sh - source ./scripts/flags.sh -- export ANDROID_NDK_PATH="$(pwd)/android-ndk-r10c" -- export NDK_HOME="$(pwd)/android-ndk-r10c" -- if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export JAVA_HOME="$(pwd)/jdk1.7.0_71"; fi -- export ANDROID_HOME="$(pwd)/android-sdk" - ./scripts/travis_before_install.sh - if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi - if [[ ${TRAVIS_OS_NAME} == "linux" && ${MASON_PLATFORM} != "android" ]]; then glxinfo; fi diff --git a/android/scripts/build-debug.sh b/android/scripts/build-debug.sh index 224148057f..450820a118 100755 --- a/android/scripts/build-debug.sh +++ b/android/scripts/build-debug.sh @@ -3,6 +3,6 @@ set -e set -o pipefail -export BUILDTYPE=Debug TESTMUNK=no +export BUILDTYPE=Debug ./android/scripts/common.sh $1 diff --git a/android/scripts/build-release.sh b/android/scripts/build-release.sh index 7d44afb3d7..73c7fab81a 100755 --- a/android/scripts/build-release.sh +++ b/android/scripts/build-release.sh @@ -3,6 +3,6 @@ set -e set -o pipefail -export BUILDTYPE=Release TESTMUNK=yes +export BUILDTYPE=Release ./android/scripts/common.sh $1 diff --git a/android/scripts/common.sh b/android/scripts/common.sh index 0b8189abc2..e925ea0abd 100755 --- a/android/scripts/common.sh +++ b/android/scripts/common.sh @@ -16,5 +16,5 @@ echo "${ANDROID_KEY}" >> ./android/java/app/src/main/res/raw/token.txt make android BUILDTYPE=$BUILDTYPE -#aws s3 cp ./android/java/app/build/outputs/apk/app-debug.apk s3://android-gl-build/${NAME}/app-debug.apk -#aws s3 cp ./android/java/app/build/outputs/apk/app-release-unsigned.apk s3://android-gl-build/${NAME}/app-release-unsigned.apk +aws s3 cp ./android/java/app/build/outputs/apk/app-debug.apk s3://android-gl-build/${NAME}/app-debug.apk +aws s3 cp ./android/java/app/build/outputs/apk/app-release-unsigned.apk s3://android-gl-build/${NAME}/app-release-unsigned.apk diff --git a/android/scripts/run-build.sh b/android/scripts/run-build.sh index d038021b23..89f266f604 100755 --- a/android/scripts/run-build.sh +++ b/android/scripts/run-build.sh @@ -12,7 +12,6 @@ instance_name="android-gl-build-$TRAVIS_REPO_SLUG-$TRAVIS_JOB_NUMBER" echo $ami_name NAME=$TRAVIS_REPO_SLUG/$TRAVIS_JOB_NUMBER -CONFIG=debug user_data="#!/bin/bash cd /android @@ -26,6 +25,7 @@ user_data="#!/bin/bash export JAVA_HOME=/android/jdk1.7.0_71 export ANDROID_HOME=/android/android-sdk-linux export PATH=\$PATH:/android/jdk1.7.0_71/bin + export ANDROID_KEY=$ANDROID_KEY if ./android/scripts/build-$CONFIG.sh $NAME &>../build.log; then echo 'ANDROID BUILD PASSED' @@ -34,8 +34,7 @@ user_data="#!/bin/bash fi popd - #aws s3 cp --region us-east-1 build.log s3://android-gl-build/${NAME}/build-log.txt - aws s3 cp --region us-east-1 build.log s3://android-gl-build/test/build-log.txt + aws s3 cp --region us-east-1 build.log s3://android-gl-build/${NAME}/build-log.txt shutdown -P now" id=$(aws ec2 run-instances \ @@ -63,11 +62,13 @@ echo "Build finished" output=$(aws ec2 get-console-output --region $region --instance-id $id | jq -r '.Output') -aws s3 cp --region $region s3://android-gl-build/test/build-log.txt build.log +aws s3 cp --region $region s3://android-gl-build/${NAME}/build-log.txt build.log cat build.log if [[ $output == *"ANDROID BUILD PASSED"* ]]; then echo "ANDROID BUILD PASSED" + exit 0 else echo "ANDROID BUILD FAILED" + exit 1 fi diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index 4be8b73adb..d084860b80 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -3,87 +3,6 @@ set -e set -o pipefail -if [[ "${MASON_PLATFORM}" == "android" ]]; then - - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then - - echo "load submodules" - git submodule update --init --recursive - - echo "installing 7z" - MASON_PLATFORM= ./.mason/mason install 7z 9.20 - - echo "setting 7z path" - SEVEN_ZIP_PATH="$(MASON_PLATFORM= ./.mason/mason prefix 7z 9.20)/bin/7za" - - echo "fetching NDK" - wget http://dl.google.com/android/ndk/android-ndk-r10c-linux-x86_64.bin - - echo "chmod NDK" - chmod a+x ./android-ndk-r10c-linux-x86_64.bin - - echo "unpacking NDK" - $SEVEN_ZIP_PATH x ./android-ndk-r10c-linux-x86_64.bin > .tmp-ndk-log - rm .tmp-ndk-log - - echo "fetching JDK" - wget --no-cookies --no-check-certificate --header "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie" http://download.oracle.com/otn-pub/java/jdk/7u71-b14/jdk-7u71-linux-x64.tar.gz - - echo "unpacking JDK" - tar -xzf ./jdk-7u71-linux-x64.tar.gz - - echo "fetching SDK" - wget http://dl.google.com/android/android-sdk_r23.0.2-linux.tgz - - echo "unpacking SDK" - tar -xzf ./android-sdk_r23.0.2-linux.tgz - mv ./android-sdk-linux ./android-sdk - - echo "installing SDK" - sudo apt-get update -y - sudo apt-get -y install lib32stdc++6 lib32z1 - echo y | ./android-sdk/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.2,android-21,extra-android-m2repository,extra-google-m2repository - - echo "inserting access token" - mkdir ./android/java/app/src/main/res/raw/ - echo "${ANDROID_KEY}" >> ./android/java/app/src/main/res/raw/token.txt - - elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then - - echo "installing 7z" - MASON_PLATFORM= ./.mason/mason install 7z 9.20 - - echo "setting 7z path" - SEVEN_ZIP_PATH="$(MASON_PLATFORM= ./.mason/mason prefix 7z 9.20)/bin/7za" - - echo "fetching NDK" - wget http://dl.google.com/android/ndk/android-ndk-r10c-darwin-x86_64.bin - - echo "chmod NDK" - chmod a+x ./android-ndk-r10c-darwin-x86_64.bin - - echo "unpacking NDK" - $SEVEN_ZIP_PATH x ./android-ndk-r10c-darwin-x86_64.bin > .tmp-ndk-log - rm .tmp-ndk-log - - echo "fetching SDK" - wget http://dl.google.com/android/android-sdk_r23.0.2-macosx.zip - - echo "unpacking SDK" - unzip -qq android-sdk_r23.0.2-macosx.zip - mv ./android-sdk-macosx ./android-sdk - - echo "installing SDK" - echo y | ./android-sdk/tools/android update sdk -u -a -t tools,platform-tools,build-tools-21.1.2,android-21,extra-android-m2repository,extra-google-m2repository - - echo "inserting access token" - mkdir ./android/java/app/src/main/res/raw/ - echo "${ANDROID_KEY}" >> ./android/java/app/src/main/res/raw/token.txt - - fi - -fi - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # # install Linux dependencies diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index 6a69918552..7f78a5f3ea 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -7,13 +7,14 @@ mapbox_time "checkout_styles" \ git submodule update --init styles if [[ $MASON_PLATFORM == "android" ]]; then - mapbox_time "compile_program" \ - make android BUILDTYPE=${BUILDTYPE} + #mapbox_time "compile_program" \ + #make android BUILDTYPE=${BUILDTYPE} + ./android/scrips/run-build.sh 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 + #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 |