From e24416236fe21bc28131adc5d6656ee1f7a71308 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Thu, 21 Jul 2016 13:47:15 +0100
Subject: [PATCH] Circle will only run a single deploy step it seems

---
 circle.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/circle.yml b/circle.yml
index 5103eda97..933127351 100644
--- a/circle.yml
+++ b/circle.yml
@@ -72,7 +72,10 @@ deployment:
             docker tag weaveworks/scope:$(./image-tag) ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:$(./image-tag)
           )) &&
           docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope &&
-          docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:$(./image-tag)
+          docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:$(./image-tag) &&
+          (test "${DOCKER_ORGANIZATION:-$DOCKER_USER}" == "weaveworks" && (
+            wcloud deploy weaveworks/scope:$(./image-tag)
+          ))
         )
   hub-dev:
     branch: /^((?!master).)*$/  # not the master branch
@@ -83,12 +86,6 @@ deployment:
           docker tag weaveworks/scope:latest ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:${CIRCLE_BRANCH//\//-} &&
           docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:${CIRCLE_BRANCH//\//-}
         )
-  wcloud-weaveworks:
-    branch: master
-    owner: weaveworks
-    commands:
-      - |
-        wcloud deploy weaveworks/scope:$(./image-tag)
 #  release:
 #    branch: /release-[0-9]+\.[0-9]+/
 #    owner: weaveworks