Merge pull request #8606 from DonLakeFlyer/PlayUpload

Still fighting with Google Play Store upload

.travis.yml

@@ -20,7 +20,6 @@ jobs:
           dist: bionic
           env: SPEC=linux-g++-64 CONFIG=installer
           sudo: required
-          after_success: skip
         - stage: "Build"
           name: "Linux Debug"
           os: linux
@@ -28,32 +27,29 @@ jobs:
           env: SPEC=linux-g++-64 CONFIG=debug
           services: xvfb
           sudo: required
-          after_success: skip
         - stage: "Build"
           name: "Android 32 bit"
           dist: trusty
           language: android
           env: SPEC=android-clang CONFIG=installer BITNESS=32 GSTREAMER_NAME=armv7
           sudo: false
-          after_success: skip
         - stage: "Build"
           name: "Android 64 bit"
           dist: trusty
           language: android
           env: SPEC=android-clang CONFIG=installer BITNESS=64 GSTREAMER_NAME=arm64
           sudo: false
-          after_success: skip
         - stage: "Build"
           name: "OSX Installer"
           os: osx
           osx_image: xcode11.3
           env: SPEC=macx-clang CONFIG=installer
           sudo: required
-          after_success: skip
         - stage: "Google Play Upload"
           name: "Google Play Upload"
           dist: trusty
           language: android
+          env: SPEC=google-play-upload
           sudo: false
           before_install: skip
           install: skip
@@ -61,7 +57,7 @@ jobs:
           before_deploy: skip
           deploy: skip
           after_deploy: skip
-          script: echo "Final Stage"
+          script: echo "Google Play Upload"
         
 # iOS build needs updating Qt to > 5.10
 #        - os: osx
@@ -228,7 +224,7 @@ after_success:
     else
         GOOGLE_PLAY_PKG=none;
     fi
-  - if [[ "${TRAVIS_PULL_REQUEST}" = "false" && "${GOOGLE_PLAY_PKG}" != "none" ]]; then
+  - if [[ "${SPEC}" = "google-play-upload" && "${TRAVIS_PULL_REQUEST}" = "false" && "${GOOGLE_PLAY_PKG}" != "none" ]]; then
         wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/builds/${TRAVIS_BRANCH}/QGroundControl32.apk &&
         wget --quiet https://s3-us-west-2.amazonaws.com/qgroundcontrol/builds/${TRAVIS_BRANCH}/QGroundControl64.apk &&
         pip install --user --upgrade oauth2client &&