Unverified Commit 52e137bd authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #8604 from DonLakeFlyer/TravisJobs

Travis: Switch to using new jobs: tag
parents 919ee98f 169179fe
......@@ -11,35 +11,58 @@ env:
# ANDROID_STOREPASS
- secure: RGovyUnMw3fp/bHZi058JvANT1rYmNqrsuSYew0cIgirO6YbMHr/rsjwCm1FTYpBl8s1zgr+u2b8ftYnfnCz2YT+Aip4NWrVYpVU0FEmfytGILrnUS0pjlt8m7fU9AKR1ElOSll7yw7e1kftynN39Q321etvwbLZcXon6zz0suE=
matrix:
jobs:
fast_finish: true
include:
- name: "Linux Installer"
- stage: "Build"
name: "Linux Installer"
os: linux
dist: bionic
env: SPEC=linux-g++-64 CONFIG=installer
sudo: required
- name: "Linux Debug"
after_success: skip
- stage: "Build"
name: "Linux Debug"
os: linux
dist: bionic
env: SPEC=linux-g++-64 CONFIG=debug
services: xvfb
sudo: required
- name: "Android 32 bit"
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
- name: "Android 64 bit"
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
- name: "OSX Installer"
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
sudo: false
before_install: skip
install: skip
before_script: skip
before_deploy: skip
deploy: skip
after_deploy: skip
script: echo "Final Stage"
# iOS build needs updating Qt to > 5.10
# - os: osx
# osx_image: xcode9.2
......@@ -196,10 +219,8 @@ script:
fi
after_success:
# This is only used to upload android builds to Google Play
- cd ${TRAVIS_BUILD_DIR}
# master development builds to beta track
- GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrolbeta
- if [ "${TRAVIS_TAG}" ]; then
GOOGLE_PLAY_PKG=org.mavlink.qgroundcontrol;
elif [ "${TRAVIS_BRANCH}" = "master" ]; then
......@@ -208,10 +229,12 @@ after_success:
GOOGLE_PLAY_PKG=none;
fi
- if [[ "${SPEC}" = "android-clang" && "${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 &&
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;
./deploy/GooglePlayUpload.py ${GOOGLE_PLAY_PKG};
fi
before_deploy:
......
#!/usr/bin/python
#
# Copyright 2014 Marta Rodriguez.
#
# Licensed under the Apache License, Version 2.0 (the 'License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
"""Uploads an apk to the google play store."""
import argparse
from apiclient.discovery import build
import httplib2
from oauth2client import client
from oauth2client.service_account import ServiceAccountCredentials
JSON_KEY='android/Google_Play_Android_Developer-4432a3c4f5d1.json'
# Declare command-line flags.
argparser = argparse.ArgumentParser(add_help=False)
argparser.add_argument('package_name',
help='The package name. Example: com.android.sample')
def main():
# Create an httplib2.Http object to handle our HTTP requests and authorize it
# with the Credentials. Note that the first parameter, service_account_name,
# is the Email address created for the Service account. It must be the email
# address associated with the key that was created.
credentials = ServiceAccountCredentials.from_json_keyfile_name(JSON_KEY, scopes=['https://www.googleapis.com/auth/androidpublisher'])
http = httplib2.Http()
http = credentials.authorize(http)
service = build('androidpublisher', 'v3', http=http)
# Process flags and read their values.
flags = argparser.parse_args()
release_track = 'production'
package_name = flags.package_name
try:
print 'Uploading package %s to track %s' % (package_name, release_track)
edit_request = service.edits().insert(body={}, packageName=package_name)
result = edit_request.execute()
edit_id = result['id']
apk_response_32 = service.edits().apks().upload(
editId=edit_id,
packageName=package_name,
media_body='QGroundControl32.apk').execute()
print 'Version code %d has been uploaded' % apk_response_32['versionCode']
apk_response_64 = service.edits().apks().upload(
editId=edit_id,
packageName=package_name,
media_body='QGroundControl64.apk').execute()
print 'Version code %d has been uploaded' % apk_response_64['versionCode']
track_response = service.edits().tracks().update(
editId=edit_id,
track=release_track,
packageName=package_name,
body={u'releases': [{
u'versionCodes': [str(apk_response_32['versionCode']), str(apk_response_64['versionCode'])],
u'status': u'completed',
}]}).execute()
print 'Track %s is set with releases: %s' % (
track_response['track'], str(track_response['releases']))
commit_request = service.edits().commit(
editId=edit_id, packageName=package_name).execute()
print 'Edit "%s" has been committed' % (commit_request['id'])
except client.AccessTokenRefreshError:
print ('The credentials have been revoked or expired, please re-run the '
'application to re-authorize')
if __name__ == '__main__':
main()
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