summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>2015-04-14 18:24:19 +0000
committerkazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>2015-04-14 18:24:19 +0000
commit8765a0fcc84e310dfbe536b9fcd660100af8b6db (patch)
tree483349bfa3da56dffa6effdfb6ffcb1e52db4cb8
parentb983816deaf471df7951dde4745a467b2435af5a (diff)
downloadnavit-svn-8765a0fcc84e310dfbe536b9fcd660100af8b6db.tar.gz
Fix:CI:Merge into master only if the tests were successful
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6080 ffa7fe5e-494d-0410-b361-a75ebd5db220
-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