From d761f18e5b81ea545a79ad6dc36904f0e5426d8f Mon Sep 17 00:00:00 2001 From: Alban Crequy Date: Thu, 21 Jul 2016 15:19:14 +0200 Subject: [PATCH] circle.yml: another fix for deploy master with non-upstream hub accounts After https://github.com/weaveworks/scope/commit/e2441623 "wcloud deploy" is run in the main deploy unit guarded by the environment variable. But the test makes it fail when it is not run under "weaveworks". --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 933127351..b328890d0 100644 --- a/circle.yml +++ b/circle.yml @@ -73,7 +73,7 @@ deployment: )) && docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope && docker push ${DOCKER_ORGANIZATION:-$DOCKER_USER}/scope:$(./image-tag) && - (test "${DOCKER_ORGANIZATION:-$DOCKER_USER}" == "weaveworks" && ( + (test "${DOCKER_ORGANIZATION:-$DOCKER_USER}" != "weaveworks" || ( wcloud deploy weaveworks/scope:$(./image-tag) )) )