From 0d47b74a7f3f42640d0714b651417415461b1b8c Mon Sep 17 00:00:00 2001 From: Dan Walsh Date: Fri, 6 Nov 2015 08:35:47 +0100 Subject: [PATCH] Since default is dynbinary we should test with dynbinary Signed-off-by: Dan Walsh --- Makefile | 12 ++++++------ hack/make.sh | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index c1f58806e2..e5f78f8700 100644 --- a/Makefile +++ b/Makefile @@ -49,25 +49,25 @@ binary: build $(DOCKER_RUN_DOCKER) hack/make.sh binary cross: build - $(DOCKER_RUN_DOCKER) hack/make.sh binary cross + $(DOCKER_RUN_DOCKER) hack/make.sh dynbinary binary cross deb: build - $(DOCKER_RUN_DOCKER) hack/make.sh binary build-deb + $(DOCKER_RUN_DOCKER) hack/make.sh dynbinary build-deb rpm: build - $(DOCKER_RUN_DOCKER) hack/make.sh binary build-rpm + $(DOCKER_RUN_DOCKER) hack/make.sh dynbinary build-rpm test: build - $(DOCKER_RUN_DOCKER) hack/make.sh binary cross test-unit test-integration-cli test-docker-py + $(DOCKER_RUN_DOCKER) hack/make.sh dynbinary cross test-unit test-integration-cli test-docker-py test-unit: build $(DOCKER_RUN_DOCKER) hack/make.sh test-unit test-integration-cli: build - $(DOCKER_RUN_DOCKER) hack/make.sh binary test-integration-cli + $(DOCKER_RUN_DOCKER) hack/make.sh dynbinary test-integration-cli test-docker-py: build - $(DOCKER_RUN_DOCKER) hack/make.sh binary test-docker-py + $(DOCKER_RUN_DOCKER) hack/make.sh dynbinary test-docker-py validate: build $(DOCKER_RUN_DOCKER) hack/make.sh validate-dco validate-gofmt validate-pkg validate-lint validate-test validate-toml validate-vet diff --git a/hack/make.sh b/hack/make.sh index fd60e41400..fe851e77e2 100755 --- a/hack/make.sh +++ b/hack/make.sh @@ -53,13 +53,12 @@ DEFAULT_BUNDLES=( validate-vet binary + dynbinary test-unit test-integration-cli test-docker-py - dynbinary - cover cross tgz