From 9c599ebe596d2742ccf5ed3fe3eadb549ece344d Mon Sep 17 00:00:00 2001 From: Mirco Nasuti <mirco.nasuti@chuv.ch> Date: Fri, 30 Sep 2016 15:26:22 +0200 Subject: [PATCH] update circle.yml --- circle.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/circle.yml b/circle.yml index e2071aafe..faf8bd044 100644 --- a/circle.yml +++ b/circle.yml @@ -9,17 +9,20 @@ test: override: - ./test.sh deployment: - automerge: + hub: 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 - - git fetch origin stable + automerge: + branch: master + commands: + - git fetch hub stable - git checkout stable - - git pull origin master - - git push origin stable + - git pull hub master + - git push hub stable - set +x - mvn sonar:sonar -Dsonar.login=$SONAR_KEY - set -x -- GitLab