From 98d7887ba0941a666b159a08b7f801afda11cfc6 Mon Sep 17 00:00:00 2001
From: Tom Wilkie <tom.wilkie@gmail.com>
Date: Sat, 16 Jan 2016 12:22:23 -0800
Subject: [PATCH] Condense some more steps in circle, this seems to speed
 things up.

---
 circle.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/circle.yml b/circle.yml
index de1e3fa63..d886538c7 100644
--- a/circle.yml
+++ b/circle.yml
@@ -17,11 +17,14 @@ dependencies:
   cache_directories:
     - "~/docker"
   override:
-    - "sudo apt-get update && sudo apt-get install jq pv"
-    - curl https://sdk.cloud.google.com | bash
-    - test -z "$SECRET_PASSWORD" || bin/setup-circleci-secrets "$SECRET_PASSWORD"
-    - make deps
-    - "mkdir -p $(dirname $SRCDIR) && cp -r $(pwd)/ $SRCDIR"
+    - >
+      sudo apt-get update &&
+      sudo apt-get install jq pv &&
+      (curl https://sdk.cloud.google.com | bash) &&
+      (test -z "$SECRET_PASSWORD" || bin/setup-circleci-secrets "$SECRET_PASSWORD") &&
+      make deps &&
+      mkdir -p $(dirname $SRCDIR) &&
+      cp -r $(pwd)/ $SRCDIR
     - "cd $SRCDIR/client; ../tools/rebuild-image weaveworks/scope-ui-build . Dockerfile package.json webpack.production.config.js .eslintrc .babelrc && touch $SRCDIR/.scope_ui_build.uptodate"
     - "cd $SRCDIR/backend; ../tools/rebuild-image weaveworks/scope-backend-build . Dockerfile build.sh && touch $SRCDIR/.scope_backend_build.uptodate"
     - cd $SRCDIR/integration; ./gce.sh make_template: