From de6655ba945ec4c983bfe1055cf24290e7e16e5c Mon Sep 17 00:00:00 2001 From: Tom Wilkie Date: Mon, 26 Oct 2015 15:29:54 +0000 Subject: [PATCH] Fix couple of minor typos. --- Makefile | 2 +- circle.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 91b45f9206..4181d83468 100644 --- a/Makefile +++ b/Makefile @@ -106,7 +106,7 @@ clean: ifeq ($(BUILD_IN_CONTAINER),true) tests: $(SUDO) docker run -ti $(RM) -v $(shell pwd):/go/src/github.com/weaveworks/scope \ - -e GOARCH -e GOOS \ --entrypoint=/bin/sh $(SCOPE_BACKEND_BUILD_IMAGE) -c \ + -e GOARCH -e GOOS --entrypoint=/bin/sh $(SCOPE_BACKEND_BUILD_IMAGE) -c \ "cd /go/src/github.com/weaveworks/scope && ./tools/test" else tests: diff --git a/circle.yml b/circle.yml index 8f94ed76d1..9ec09aaf27 100644 --- a/circle.yml +++ b/circle.yml @@ -39,8 +39,8 @@ test: - cd $SRCDIR; make RM= tests - cd $SRCDIR; make RM= client-test - cd $SRCDIR; make RM= static - - cd $SRCDIR; rm -f app/scope-app probe/scope-probe; GOARCH=arm make RM= backend - - cd $SRCDIR; rm -f app/scope-app probe/scope-probe; GOOS=darwin make RM= backend + - cd $SRCDIR; rm -f app/scope-app probe/scope-probe; GOARCH=arm make RM= app/scope-app probe/scope-probe + - cd $SRCDIR; rm -f app/scope-app probe/scope-probe; GOOS=darwin make RM= app/scope-app probe/scope-probe - cd $SRCDIR; rm -f app/scope-app probe/scope-probe; make RM= - cd $SRCDIR/experimental; make - test -z "$SECRET_PASSWORD" || (cd $SRCDIR/integration; ./gce.sh setup)