mystiq/dex
Archived
4
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Makefile: error out if go files aren't correctly formatted

Browse source 
Noticed in #1058 that our gofmt make target isn't actually erroring
if someone commits misformatted code.
This commit is contained in:
Eric Chiang 2017-09-14 09:44:15 -07:00
parent 38d0de20e3
commit 980400db0b
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -51,7 +51,7 @@ vet:
@go vet $(shell go list ./... | grep -v '/vendor/') @go vet $(shell go list ./... | grep -v '/vendor/')
fmt: fmt:
@go fmt $(shell go list ./... | grep -v '/vendor/') @./scripts/gofmt $(shell go list ./... | grep -v '/vendor/')
lint: lint:
@for package in $(shell go list ./... | grep -v '/vendor/' | grep -v '/api' | grep -v '/server/internal'); do \ @for package in $(shell go list ./... | grep -v '/vendor/' | grep -v '/api' | grep -v '/server/internal'); do \

6
connector/github/github.go
View file

@ -503,13 +503,13 @@ func (c *githubConnector) userEmail(ctx context.Context, client *http.Client) (s
advised them not to check for verified emails advised them not to check for verified emails
(https://circleci.com/enterprise/changelog/#1-47-1). (https://circleci.com/enterprise/changelog/#1-47-1).
In addition, GitHub Enterprise support replied to a support In addition, GitHub Enterprise support replied to a support
ticket with "There is no way to verify an email address in ticket with "There is no way to verify an email address in
GitHub Enterprise." GitHub Enterprise."
*/ */
if c.hostName != "" { if c.hostName != "" {
email.Verified = true email.Verified = true
} }
if email.Verified && email.Primary { if email.Verified && email.Primary {
return email.Email, nil return email.Email, nil
} }

7
scripts/gofmt Executable file
View file

@ -0,0 +1,7 @@
#!/bin/bash -e
result=$( go fmt $@ )
if [[ $result != "" ]]; then
>&2 echo "The following files are not formatted correctly: $result"
exit 1
fi