Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
69a93291
Commit
69a93291
authored
Feb 20, 2016
by
Daniel Agar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
travis-ci google play deploy fix
-try using new oauth2client
parent
db1987ac
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
.travis.yml
.travis.yml
+1
-2
google_play_upload.py
tools/google_play_upload.py
+2
-4
No files found.
.travis.yml
View file @
69a93291
...
@@ -124,8 +124,7 @@ script:
...
@@ -124,8 +124,7 @@ script:
after_success
:
after_success
:
-
if [[ "${TRAVIS_OS_NAME}" = "android" && "${TRAVIS_PULL_REQUEST}" = "false" && "${TRAVIS_BRANCH}" = "master" ]]; then
-
if [[ "${TRAVIS_OS_NAME}" = "android" && "${TRAVIS_PULL_REQUEST}" = "false" && "${TRAVIS_BRANCH}" = "master" ]]; then
pip install --user oauth2client==1.5.2
pip install --user google-api-python-client PyOpenSSL
&& pip install --user google-api-python-client PyOpenSSL
&& cd ${SHADOW_BUILD_DIR} && openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in ${TRAVIS_BUILD_DIR}/Google_Play_Android_Developer-bb93ae7d61ca.p12.enc -out Google_Play_Android_Developer-bb93ae7d61ca.p12 -d
&& cd ${SHADOW_BUILD_DIR} && openssl aes-256-cbc -K $encrypted_25db6eb7c3fd_key -iv $encrypted_25db6eb7c3fd_iv -in ${TRAVIS_BUILD_DIR}/Google_Play_Android_Developer-bb93ae7d61ca.p12.enc -out Google_Play_Android_Developer-bb93ae7d61ca.p12 -d
&& ${TRAVIS_BUILD_DIR}/tools/google_play_upload.py org.mavlink.qgroundcontrol ${SHADOW_BUILD_DIR}/release/package/qgroundcontrol.apk
&& ${TRAVIS_BUILD_DIR}/tools/google_play_upload.py org.mavlink.qgroundcontrol ${SHADOW_BUILD_DIR}/release/package/qgroundcontrol.apk
;
;
...
...
tools/google_play_upload.py
View file @
69a93291
...
@@ -21,6 +21,7 @@ import argparse
...
@@ -21,6 +21,7 @@ import argparse
from
apiclient.discovery
import
build
from
apiclient.discovery
import
build
import
httplib2
import
httplib2
from
oauth2client
import
client
from
oauth2client
import
client
from
oauth2client.service_account
import
ServiceAccountCredentials
TRACK
=
'beta'
# Can be 'alpha', beta', 'production' or 'rollout'
TRACK
=
'beta'
# Can be 'alpha', beta', 'production' or 'rollout'
SERVICE_ACCOUNT_EMAIL
=
(
SERVICE_ACCOUNT_EMAIL
=
(
...
@@ -47,10 +48,7 @@ def main():
...
@@ -47,10 +48,7 @@ def main():
# with the Credentials. Note that the first parameter, service_account_name,
# 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
# is the Email address created for the Service account. It must be the email
# address associated with the key that was created.
# address associated with the key that was created.
credentials
=
client
.
SignedJwtAssertionCredentials
(
credentials
=
ServiceAccountCredentials
.
from_p12_keyfile
(
SERVICE_ACCOUNT_EMAIL
,
key
,
scopes
=
[
'https://www.googleapis.com/auth/androidpublisher'
])
SERVICE_ACCOUNT_EMAIL
,
key
,
scope
=
'https://www.googleapis.com/auth/androidpublisher'
)
http
=
httplib2
.
Http
()
http
=
httplib2
.
Http
()
http
=
credentials
.
authorize
(
http
)
http
=
credentials
.
authorize
(
http
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment