summaryrefslogtreecommitdiff
path: root/circle.yml
diff options
context:
space:
mode:
Diffstat (limited to 'circle.yml')
-rw-r--r--circle.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/circle.yml b/circle.yml
index 396b294c..98070e33 100644
--- a/circle.yml
+++ b/circle.yml
@@ -66,3 +66,8 @@ test:
- import -window root $CIRCLE_ARTIFACTS/default.png
- python ci/dbus_tests.py $CIRCLE_TEST_REPORTS/
- dbus-send --print-reply --session --dest=org.navit_project.navit /org/navit_project/navit/default_navit org.navit_project.navit.navit.quit
+deployment:
+ merge_into_master:
+ branch: trunk
+ commands:
+ - git push origin $CIRCLE_SHA1:refs/heads/master