Commit 06c05e86 authored by Don Gagne's avatar Don Gagne

parent 894a9135
...@@ -25,11 +25,11 @@ matrix: ...@@ -25,11 +25,11 @@ matrix:
env: SPEC=linux-g++-64 CONFIG=debug env: SPEC=linux-g++-64 CONFIG=debug
services: xvfb services: xvfb
sudo: required sudo: required
- name: "Android 32 bit" # - name: "Android 32 bit"
dist: trusty # dist: trusty
language: android # language: android
env: SPEC=android-clang CONFIG=installer BITNESS=32 # env: SPEC=android-clang CONFIG=installer BITNESS=32
sudo: false # sudo: false
- name: "Android 64 bit" - name: "Android 64 bit"
dist: trusty dist: trusty
language: android language: android
...@@ -199,11 +199,11 @@ after_success: ...@@ -199,11 +199,11 @@ after_success:
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
# master development builds to beta track # master development builds to beta track
- GOOGLE_PLAY_PKG=org.mavlink.qgroundcontroldaily - GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrolbeta
- if [ "${TRAVIS_TAG}" ]; then - if [ "${TRAVIS_TAG}" ]; then
GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol; GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol;
elif [ "${TRAVIS_BRANCH}" = "master" ]; then elif [ "${TRAVIS_BRANCH}" = "master" ]; then
GOOGLE_PLAY_PKG=org.mavlink.qgroundcontroldaily; GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrolbeta;
else else
GOOGLE_PLAY_PKG=none; GOOGLE_PLAY_PKG=none;
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment