Merge pull request #8602 from DonLakeFlyer/GooglePlay

Travis: Turn google play upload back on

Merge pull request #8602 from DonLakeFlyer/GooglePlay
Travis: Turn google play upload back on
919ee98f · Don Gagne · GitHub · 47fbdabd · 765993b4 · 919ee98f
Unverified Commit 919ee98f authored Mar 25, 2020 by Don Gagne Committed by GitHub Mar 25, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 7 deletions

.travis.yml .travis.yml +6 -7

No files found.
--- 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