Skip to content

Commit

Permalink
Make gas run quiet (#838)
Browse files Browse the repository at this point in the history
Signed-off-by: Yuri Shkuro <ys@uber.com>
  • Loading branch information
yurishkuro committed May 18, 2018
1 parent 7fb1964 commit 38cee1b
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ GOTEST=go test -v $(RACE)
GOLINT=golint
GOVET=go vet
GOFMT=gofmt
GAS=gas -exclude=G104
GAS=gas -quiet -exclude=G104
FMT_LOG=fmt.log
LINT_LOG=lint.log
IMPORT_LOG=import.log
Expand Down Expand Up @@ -105,12 +105,12 @@ fmt:
$(GOFMT) -e -s -l -w $(ALL_SRC)
./scripts/updateLicenses.sh

.PHONY: gas
gas: install-gas
.PHONY: lint-gas
lint-gas:
$(GAS) $(TOP_PKGS)

.PHONY: lint
lint: gas
lint: lint-gas
$(GOVET) $(TOP_PKGS)
@cat /dev/null > $(LINT_LOG)
@$(foreach pkg, $(TOP_PKGS), $(GOLINT) $(pkg) | grep -v -e pkg/es/wrapper.go -e /mocks/ -e thrift-gen -e thrift-0.9.2 >> $(LINT_LOG) || true;)
Expand All @@ -133,10 +133,6 @@ install-go-bindata:
go get github.com/jteeuwen/go-bindata/...
go get github.com/elazarl/go-bindata-assetfs/...

.PHONY: install-gas
install-gas:
go get github.com/GoASTScanner/gas/cmd/gas/...

.PHONY: build-examples
build-examples: install-go-bindata
(cd ./examples/hotrod/services/frontend/ && go-bindata-assetfs -pkg frontend web_assets/...)
Expand Down Expand Up @@ -234,13 +230,17 @@ build-crossdock: docker-no-ui
build-crossdock-fresh: build-crossdock-linux
make crossdock-fresh

.PHONY: install-ci
install-ci: install
.PHONY: install-tools
install-tools:
go get github.com/wadey/gocovmerge
go get github.com/mattn/goveralls
go get golang.org/x/tools/cmd/cover
go get github.com/golang/lint/golint
go get github.com/sectioneight/md-to-godoc
go get github.com/GoASTScanner/gas/cmd/gas/...

.PHONY: install-ci
install-ci: install install-tools

.PHONY: test-ci
test-ci: build-examples lint cover
Expand Down

0 comments on commit 38cee1b

Please sign in to comment.