From 765993b4316fa9b9546b171283c4841560849098 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Wed, 25 Mar 2020 13:40:46 -0700 Subject: [PATCH] Turn google play upload back on --- .travis.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a4a2e7f69..71997160c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -207,13 +207,12 @@ after_success: else GOOGLE_PLAY_PKG=none; fi - # Store upload disabled to try to workaround 64/32 bit upload problem manually - #- if [[ "${SPEC}" = "android-clang" && "${TRAVIS_PULL_REQUEST}" = "false" && "${GOOGLE_PLAY_PKG}" != "none" ]]; then - # pip install --user --upgrade oauth2client && - # pip install --user google-api-python-client pyopenssl ndg-httpsclient pyasn1 && - # openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in android/Google_Play_Android_Developer-4432a3c4f5d1.json.enc -out android/Google_Play_Android_Developer-4432a3c4f5d1.json -d && - # ./tools/google_play_upload.py production ${GOOGLE_PLAY_PKG} ${SHADOW_BUILD_DIR}/release/package/QGroundControl${BITNESS}.apk; - # fi + - if [[ "${SPEC}" = "android-clang" && "${TRAVIS_PULL_REQUEST}" = "false" && "${GOOGLE_PLAY_PKG}" != "none" ]]; then + pip install --user --upgrade oauth2client && + pip install --user google-api-python-client pyopenssl ndg-httpsclient pyasn1 && + openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in android/Google_Play_Android_Developer-4432a3c4f5d1.json.enc -out android/Google_Play_Android_Developer-4432a3c4f5d1.json -d && + ./tools/google_play_upload.py production ${GOOGLE_PLAY_PKG} ${SHADOW_BUILD_DIR}/release/package/QGroundControl${BITNESS}.apk; + fi before_deploy: # create linux appimage -- 2.22.0