Release script should use make tests to run tests.

This commit is contained in:
Tom Wilkie
2015-11-02 16:38:07 +00:00
parent 8f2dc64762
commit bcd346ab5b
2 changed files with 2 additions and 3 deletions

View File

@@ -106,8 +106,7 @@ clean:
ifeq ($(BUILD_IN_CONTAINER),true)
tests:
$(SUDO) docker run $(RM) -v $(shell pwd):/go/src/github.com/weaveworks/scope \
-e GOARCH -e GOOS -e CIRCLECI --entrypoint=/bin/sh $(SCOPE_BACKEND_BUILD_IMAGE) -c \
"cd /go/src/github.com/weaveworks/scope && ./tools/test -no-go-get"
-e GOARCH -e GOOS -e CIRCLECI $(SCOPE_BACKEND_BUILD_IMAGE) tests
else
tests:
./tools/test -no-go-get

View File

@@ -91,7 +91,7 @@ build() {
sed -i "/SCRIPT_VERSION=/ c\SCRIPT_VERSION=\"$VERSION\"" ./scope
make SUDO=$SUDO SCOPE_VERSION=$VERSION DOCKERHUB_USER=$DOCKERHUB_USER
if $(go list -e -f {{.Dir}} github.com/weaveworks/tools)/test; then
if make tests; then
echo -e '\u2713 Tests pass'
else
echo -e "\u2757 Tests failed, probably best not publish this one" >&2