alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit '33d58fdc29b90120bf16e536042379251f8631f2' into release-tools

Browse Source
This commit is contained in:
Patrick Ohly
2019-01-25 19:07:33 +01:00
parent ab241b96fc 33d58fdc29
commit 4d695978d8
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
release-tools/build.make
View File

@@ -51,11 +51,15 @@ IMAGE_TAGS+=$(shell tagged="$$(git describe --tags --match='v*' --abbrev=0)"; if
IMAGE_NAME=$(REGISTRY_NAME)/$* IMAGE_NAME=$(REGISTRY_NAME)/$*
ifdef V ifdef V
# Adding "-alsologtostderr" assumes that all test binaries contain glog. This is not guaranteed.
TESTARGS = -v -args -alsologtostderr -v 5 TESTARGS = -v -args -alsologtostderr -v 5
else else
TESTARGS = TESTARGS =
endif endif
# Specific packages can be excluded from each of the tests below by setting the *_FILTER_CMD variables
# to something like "| grep -v 'github.com/kubernetes-csi/project/pkg/foobar'". See usage below.
build-%: build-%:
mkdir -p bin mkdir -p bin
CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-X main.version=$(REV) -extldflags "-static"' -o ./bin/$* ./cmd/$* CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-X main.version=$(REV) -extldflags "-static"' -o ./bin/$* ./cmd/$*
@@ -70,7 +74,7 @@ push-%: container-%
docker push $(IMAGE_NAME):$$tag; \ docker push $(IMAGE_NAME):$$tag; \
}; \ }; \
for tag in $(IMAGE_TAGS); do \ for tag in $(IMAGE_TAGS); do \
if echo $$tag | grep -q -e '-canary$$'; then \ if [ "$$tag" = "canary" ] || echo "$$tag" | grep -q -e '-canary$$'; then \
: "creating or overwriting canary image"; \ : "creating or overwriting canary image"; \
push_image; \ push_image; \
elif docker pull $(IMAGE_NAME):$$tag 2>&1 | tee /dev/stderr | grep -q "manifest for $(IMAGE_NAME):$$tag not found"; then \ elif docker pull $(IMAGE_NAME):$$tag 2>&1 | tee /dev/stderr | grep -q "manifest for $(IMAGE_NAME):$$tag not found"; then \
@@ -93,20 +97,20 @@ test:
.PHONY: test-go .PHONY: test-go
test: test-go test: test-go
test-go: test-go:
@ echo; echo $@ @ echo; echo "### $@:"
go test `go list ./... | grep -v 'vendor'` $(TESTARGS) go test `go list ./... | grep -v 'vendor' $(TEST_GO_FILTER_CMD)` $(TESTARGS)
.PHONY: test-vet .PHONY: test-vet
test: test-vet test: test-vet
test-vet: test-vet:
@ echo; echo $@ @ echo; echo "### $@:"
go vet `go list ./... | grep -v vendor` go vet `go list ./... | grep -v vendor $(TEST_VET_FILTER_CMD)`
.PHONY: test-fmt .PHONY: test-fmt
test: test-fmt test: test-fmt
test-fmt: test-fmt:
@ echo; echo $@ @ echo; echo "### $@:"
files=$$(find . -name '*.go' | grep -v './vendor'); \ files=$$(find . -name '*.go' | grep -v './vendor' $(TEST_FMT_FILTER_CMD)); \
if [ $$(gofmt -d $$files | wc -l) -ne 0 ]; then \ if [ $$(gofmt -d $$files | wc -l) -ne 0 ]; then \
echo "formatting errors:"; \ echo "formatting errors:"; \
gofmt -d $$files; \ gofmt -d $$files; \
@@ -116,5 +120,5 @@ test-fmt:
.PHONY: test-subtree .PHONY: test-subtree
test: test-subtree test: test-subtree
test-subtree: test-subtree:
@ echo; echo $@ @ echo; echo "### $@:"
./release-tools/verify-subtree.sh release-tools ./release-tools/verify-subtree.sh release-tools