From 48996aad6a8ff1ea4f2126db4612c4210251c355 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Thu, 31 Aug 2017 10:26:08 +0100
Subject: [PATCH] make circleci ui-upload unconditional

It doesn't depend on $DOCKER_USER. Also, because it was tagged on
without a &&, it was masking errors in the dockerhub image uploads.
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index 0858da0f1..015a19c2b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -86,7 +86,6 @@ deployment:
             docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/$IMAGE &&
             docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/$IMAGE:$(./tools/image-tag)
           done
-          (test -z "${UI_BUCKET_KEY_ID}" || (cd $SRCDIR && make ui-upload && make ui-pkg-upload))
         )
       - |
         test -z "${QUAY_USER}" || (
@@ -94,6 +93,7 @@ deployment:
           docker tag weaveworks/scope:$(./tools/image-tag) "quay.io/${QUAY_ORGANIZATION}/scope:$(./tools/image-tag)" &&
           docker push "quay.io/${QUAY_ORGANIZATION}/scope:$(./tools/image-tag)"
         )
+      - test -z "${UI_BUCKET_KEY_ID}" || (cd $SRCDIR && make ui-upload && make ui-pkg-upload))
   hub-dev:
     branch: /^((?!master).)*$/  # not the master branch
     commands: