summaryrefslogtreecommitdiff
path: root/circle.yml
diff options
context:
space:
mode:
authorPierre GRANDIN <pgrandin@users.noreply.github.com>2017-02-23 06:35:25 -0800
committerGitHub <noreply@github.com>2017-02-23 06:35:25 -0800
commit20cf85a6d57e847335ee82485ebcd76a20d37320 (patch)
tree56eee88bfef3915351367826830df230fbce6bc3 /circle.yml
parent777824d098288d3199cda82bbffe9ffeded7e527 (diff)
parent8363731af73d71afec3aad1c6145f759570e3e7f (diff)
downloadnavit-20cf85a6d57e847335ee82485ebcd76a20d37320.tar.gz
Merge branch 'trunk' into add_linux_testsadd_linux_tests
Diffstat (limited to 'circle.yml')
-rw-r--r--circle.yml6
1 files changed, 5 insertions, 1 deletions
diff --git a/circle.yml b/circle.yml
index 4b296a25c..9321c75b1 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,7 +6,6 @@ dependencies:
- ~/.android
- ~/android
- "~/assets/"
- - ~/tomtom_assets
pre:
- "[ -d ~/assets ] || mkdir ~/assets"
- "[ -d ~/android ] || mkdir ~/android"
@@ -31,6 +30,11 @@ test:
files:
- ci/build_*.sh
deployment:
+ publish_to_playstore:
+ branch: master
+ owner: navit-gps
+ commands:
+ - bash ci/publish.sh
merge_into_master:
branch: trunk
owner: navit-gps