Просмотр исходного кода

Since default is dynbinary we should test with dynbinary

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Dan Walsh 9 лет назад
Родитель
Сommit
0d47b74a7f
2 измененных файлов с 7 добавлено и 8 удалено
  1. 6 6
      Makefile
  2. 1 2
      hack/make.sh

+ 6 - 6
Makefile

@@ -49,25 +49,25 @@ binary: build
 	$(DOCKER_RUN_DOCKER) hack/make.sh binary
 	$(DOCKER_RUN_DOCKER) hack/make.sh binary
 
 
 cross: build
 cross: build
-	$(DOCKER_RUN_DOCKER) hack/make.sh binary cross
+	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary binary cross
 
 
 deb: build
 deb: build
-	$(DOCKER_RUN_DOCKER) hack/make.sh binary build-deb
+	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary build-deb
 
 
 rpm: build
 rpm: build
-	$(DOCKER_RUN_DOCKER) hack/make.sh binary build-rpm
+	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary build-rpm
 
 
 test: build
 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
 test-unit: build
 	$(DOCKER_RUN_DOCKER) hack/make.sh test-unit
 	$(DOCKER_RUN_DOCKER) hack/make.sh test-unit
 
 
 test-integration-cli: build
 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
 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
 validate: build
 	$(DOCKER_RUN_DOCKER) hack/make.sh validate-dco validate-gofmt validate-pkg validate-lint validate-test validate-toml validate-vet
 	$(DOCKER_RUN_DOCKER) hack/make.sh validate-dco validate-gofmt validate-pkg validate-lint validate-test validate-toml validate-vet

+ 1 - 2
hack/make.sh

@@ -53,13 +53,12 @@ DEFAULT_BUNDLES=(
 	validate-vet
 	validate-vet
 
 
 	binary
 	binary
+	dynbinary
 
 
 	test-unit
 	test-unit
 	test-integration-cli
 	test-integration-cli
 	test-docker-py
 	test-docker-py
 
 
-	dynbinary
-
 	cover
 	cover
 	cross
 	cross
 	tgz
 	tgz