From b0f7d9dfad7e02e42854ae4a81d7023655a2fd14 Mon Sep 17 00:00:00 2001
From: kazer_ <kazer_@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Date: Tue, 14 Apr 2015 18:24:19 +0000
Subject: 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
---
 circle.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/circle.yml b/circle.yml
index 396b294ca..98070e336 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
-- 
cgit v1.2.1