Merge commit 'f9dcbf62a4727e0c28554516644afe6762e784d2' into bump-tools

weaveworks · Jan 17, 2017 · eb29a64 · eb29a64
2 parents 75ed573 + f9dcbf6
commit eb29a64
Show file tree

Hide file tree

Showing 17 changed files with 457 additions and 819 deletions.
diff --git a/tools/.gitignore b/tools/.gitignore
@@ -2,6 +2,5 @@ cover/cover
 socks/proxy
 socks/image.tar
 runner/runner
-cmd/wcloud/wcloud
 *.pyc
 *~
diff --git a/tools/circle.yml b/tools/circle.yml
@@ -8,17 +8,23 @@ machine:
 
 dependencies:
   post:
+    - sudo chmod a+wr --recursive /usr/local/go/pkg
     - go clean -i net
     - go install -tags netgo std
     - mkdir -p $(dirname $SRCDIR)
     - cp -r $(pwd)/ $SRCDIR
-    - go get github.com/golang/lint/golint github.com/fzipp/gocyclo github.com/kisielk/errcheck
+    - |
+      cd $SRCDIR;
+      go get \
+        github.com/fzipp/gocyclo \
+        github.com/golang/lint/golint \
+        github.com/kisielk/errcheck \
+        gopkg.in/mvdan/sh.v1/cmd/shfmt
 
 test:
   override:
     - cd $SRCDIR; ./lint .
     - cd $SRCDIR/cover; make
     - cd $SRCDIR/socks; make
     - cd $SRCDIR/runner; make
-    - cd $SRCDIR/cmd/wcloud; make
 
diff --git a/tools/cmd/wcloud/Makefile b/tools/cmd/wcloud/Makefile
diff --git a/tools/cmd/wcloud/cli.go b/tools/cmd/wcloud/cli.go