Merge pull request #1064 from ericchiang/gofmt-fix

Makefile: error out if go files aren't correctly formatted
This commit is contained in:
Eric Chiang 2017-09-14 10:34:41 -07:00 committed by GitHub
commit 4c0cac64eb
3 changed files with 11 additions and 4 deletions

View file

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

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
(https://circleci.com/enterprise/changelog/#1-47-1).
In addition, GitHub Enterprise support replied to a support
ticket with "There is no way to verify an email address in
GitHub Enterprise."
ticket with "There is no way to verify an email address in
GitHub Enterprise."
*/
if c.hostName != "" {
email.Verified = true
}
if email.Verified && email.Primary {
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