From 9f6cb35a7aa275250c9bad88e82680523a697c67 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Sun, 12 Jun 2016 15:33:34 -0400 Subject: [PATCH] travis-ci deploy tags to google play prod (#3541) -closes #3479 --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index dce833ac6..df8ad066e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -172,7 +172,6 @@ script: ./tools/update_android_version.sh ; fi - - echo 'Building QGroundControl' - if [[ "${CONFIG}" != "doxygen" && "${SPEC}" != "ios" ]]; then cd ${SHADOW_BUILD_DIR} && make -j4 | sed 's/${TRAVIS_BUILD_DIR}/-/' @@ -199,15 +198,16 @@ script: after_success: - if [[ "${TRAVIS_OS_NAME}" = "linux" && "${CONFIG}" = "installer" ]]; then - ${TRAVIS_BUILD_DIR}/deploy/create_linux_appimage.sh ${TRAVIS_BUILD_DIR} ${SHADOW_BUILD_DIR}/release ${SHADOW_BUILD_DIR}/release/package - ; + ${TRAVIS_BUILD_DIR}/deploy/create_linux_appimage.sh ${TRAVIS_BUILD_DIR} ${SHADOW_BUILD_DIR}/release ${SHADOW_BUILD_DIR}/release/package; fi - if [ "${TRAVIS_TAG}" ]; then export GOOGLE_PLAY_TRACK=production; - else + elif [ "${TRAVIS_BRANCH}" = "master" ]; then export GOOGLE_PLAY_TRACK=beta; + else + export GOOGLE_PLAY_TRACK=none; fi - - if [[ "${TRAVIS_OS_NAME}" = "android" && "${TRAVIS_PULL_REQUEST}" = "false" && "${TRAVIS_BRANCH}" = "master" ]]; then + - if [[ "${TRAVIS_OS_NAME}" = "android" && "${TRAVIS_PULL_REQUEST}" = "false" && "${GOOGLE_PLAY_TRACK}" != "none" ]]; then pip install --user google-api-python-client PyOpenSSL && cd ${TRAVIS_BUILD_DIR} && openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in ${TRAVIS_BUILD_DIR}/android/Google_Play_Android_Developer-4432a3c4f5d1.json.enc -out android/Google_Play_Android_Developer-4432a3c4f5d1.json -d && -- 2.22.0