Skip to content
This repository has been archived by the owner on Dec 21, 2023. It is now read-only.

Commit

Permalink
Fix a couple bugs in Makefile (#77)
Browse files Browse the repository at this point in the history
* Fix make test to run subdirs and to ignore tools

* Fix make generate module typo
  • Loading branch information
codyaray authored Feb 21, 2019
1 parent bf93b82 commit ff129fd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ deps:

.PHONY: generate
generate:
@GO111MOUDLE=on protoc shared/connect/*.proto -Ishared/connect -I$(shell pwd)/vendor/ -I$(shell pwd)/vendor/github.com/confluentinc/ccloudapis/ --gogo_out=plugins=grpc:shared/connect
@GO111MOUDLE=on protoc shared/kafka/*.proto -Ishared/kafka -I$(shell pwd)/vendor/ -I$(shell pwd)/vendor/github.com/confluentinc/ccloudapis/ --gogo_out=plugins=grpc:shared/kafka
@GO111MOUDLE=on protoc shared/ksql/*.proto -Ishared/ksql -I$(shell pwd)/vendor/ -I$(shell pwd)/vendor/github.com/confluentinc/ccloudapis/ --gogo_out=plugins=grpc:shared/ksql
@GO111MODULE=on protoc shared/connect/*.proto -Ishared/connect -I$(shell pwd)/vendor/ -I$(shell pwd)/vendor/github.com/confluentinc/ccloudapis/ --gogo_out=plugins=grpc:shared/connect
@GO111MODULE=on protoc shared/kafka/*.proto -Ishared/kafka -I$(shell pwd)/vendor/ -I$(shell pwd)/vendor/github.com/confluentinc/ccloudapis/ --gogo_out=plugins=grpc:shared/kafka
@GO111MODULE=on protoc shared/ksql/*.proto -Ishared/ksql -I$(shell pwd)/vendor/ -I$(shell pwd)/vendor/github.com/confluentinc/ccloudapis/ --gogo_out=plugins=grpc:shared/ksql

build: generate build-go install-plugins
echo "Building CLI..."
Expand Down Expand Up @@ -54,15 +54,15 @@ lint:
coverage:
ifdef CI
@echo "" > coverage.txt
@for d in $$(go list ./... | grep -v tools | grep -v vendor); do \
@for d in $$(go list ./... | grep -v vendor); do \
GO111MODULE=on go test -v -race -coverprofile=profile.out -covermode=atomic $$d || exit 2; \
if [ -f profile.out ]; then \
cat profile.out >> coverage.txt; \
rm profile.out; \
fi; \
done
else
@GO111MODULE=on go test -race -cover $(TEST_ARGS) $(go list ./... | grep -v tools | grep -v vendor)
@GO111MODULE=on go test -race -cover $(TEST_ARGS) $$(go list ./... | grep -v vendor)
endif

.PHONY: test
Expand Down
1 change: 1 addition & 0 deletions tools/tools.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// +build tools

package tools

// This version controls our third-party tools, as per
Expand Down

0 comments on commit ff129fd

Please sign in to comment.