From da038bb2bef850ee27ba93b3f44304e1642b5569 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Fri, 30 Sep 2016 15:31:20 +0200
Subject: [PATCH] update circle.yml

---
 circle.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/circle.yml b/circle.yml
index faf8bd044..782c8a93b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -9,20 +9,13 @@ test:
   override:
     - ./test.sh
 deployment:
-  hub:
+  all:
     branch: master
     commands:
-      - set +x
       - docker login -u $DOCKER_HUB_USER -p $DOCKER_HUB_PASS -e $DOCKER_HUB_EMAIL
-      - set -x
       - captain push --branch-tags=false --commit-tags=true
-  automerge:
-    branch: master
-    commands:
       - git fetch hub stable
       - git checkout stable
       - git pull hub master
       - git push hub stable
-      - set +x
       - mvn sonar:sonar -Dsonar.login=$SONAR_KEY
-      - set -x
-- 
GitLab