From 472e19411503bd346020b8b083093c0ff5a85369 Mon Sep 17 00:00:00 2001 From: bartfokker Date: Mon, 22 Oct 2018 18:16:26 +0200 Subject: [PATCH 1/5] remove panic for fmt.Fprintf (bit prettier when printing to console) --- cmd/golangci-lint/main.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/golangci-lint/main.go b/cmd/golangci-lint/main.go index bad87e8b3626..079fc85d5562 100644 --- a/cmd/golangci-lint/main.go +++ b/cmd/golangci-lint/main.go @@ -1,6 +1,9 @@ package main import ( + "fmt" + "os" + "github.com/golangci/golangci-lint/pkg/commands" ) @@ -13,7 +16,9 @@ var ( func main() { e := commands.NewExecutor(version, commit, date) + if err := e.Execute(); err != nil { - panic(err) + fmt.Fprintf(os.Stderr, "failed executing command with error %v\n", err) + os.Exit(1) } } From 36c12b39cf7326aa7a66e8a677105e2cd3b73028 Mon Sep 17 00:00:00 2001 From: bartfokker Date: Fri, 26 Oct 2018 16:35:34 +0200 Subject: [PATCH 2/5] update building from source in readme to include buildFlags. --- README.tmpl.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.tmpl.md b/README.tmpl.md index c20e915fc3c3..c74553403a06 100644 --- a/README.tmpl.md +++ b/README.tmpl.md @@ -80,7 +80,9 @@ update if needed. ## Local Installation It's a not recommended for your CI pipeline. Only install like this for your local development environment. ```bash -go get -u github.com/golangci/golangci-lint/cmd/golangci-lint +go get -u github.com/golangci/golangci-lint +cd $GOPATH/src/github.com/golangci/golangci-lint/cmd/golangci-lint +go install -ldflags "-X 'main.version=$(git rev-parse --abbrev-ref HEAD)' -X 'main.commit=$(git rev-parse --short HEAD)' -X 'main.date=$(date)'" ``` You can also install it on OSX using brew: From 4fb19ef3955c16b5be59b8294bd509d2bd42b56a Mon Sep 17 00:00:00 2001 From: bartfokker Date: Fri, 26 Oct 2018 16:48:16 +0200 Subject: [PATCH 3/5] update generated README.md --- README.md | 4 +++- go.sum | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2ad81f3ff233..cb73cf8bf719 100644 --- a/README.md +++ b/README.md @@ -80,7 +80,9 @@ update if needed. ## Local Installation It's a not recommended for your CI pipeline. Only install like this for your local development environment. ```bash -go get -u github.com/golangci/golangci-lint/cmd/golangci-lint +go get -u github.com/golangci/golangci-lint +cd $GOPATH/src/github.com/golangci/golangci-lint/cmd/golangci-lint +go install -ldflags "-X 'main.version=$(git rev-parse --abbrev-ref HEAD)' -X 'main.commit=$(git rev-parse --short HEAD)' -X 'main.date=$(date)'" ``` You can also install it on OSX using brew: diff --git a/go.sum b/go.sum index 40167bd0f3ce..7f10bde14b1b 100644 --- a/go.sum +++ b/go.sum @@ -131,6 +131,7 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180826000951-f6ba57429505/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180831211245-5d4988d199e2 h1:DpCOQ3KV1qfJ60hZlyxHUgKvOehh5A/F9Fznu08v5Yw= golang.org/x/tools v0.0.0-20180831211245-5d4988d199e2/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180831211245-7ca132754999 h1:mf2VYfMpSMTlp0I/UXrX13w5LejDx34QeUUHH4TrUA8= golang.org/x/tools v0.0.0-20180831211245-7ca132754999/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 351243244780841e6a905f3880acd648d895d13a Mon Sep 17 00:00:00 2001 From: bartfokker Date: Fri, 26 Oct 2018 16:52:07 +0200 Subject: [PATCH 4/5] added golangci-lint badge to repo --- README.tmpl.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.tmpl.md b/README.tmpl.md index c74553403a06..96acc220affc 100644 --- a/README.tmpl.md +++ b/README.tmpl.md @@ -1,5 +1,6 @@ # GolangCI-Lint [![Build Status](https://travis-ci.com/golangci/golangci-lint.svg?branch=master)](https://travis-ci.com/golangci/golangci-lint) +[![GolangCI](https://golangci.com/badges/github.com/golangci/golangci-lint.svg)](https://golangci.com) GolangCI-Lint is a linters aggregator. It's fast: on average [5 times faster](#performance) than gometalinter. It's [easy to integrate and use](#command-line-options), has [nice output](#quick-start) and has a minimum number of false positives. From ef9a26c539f4cf8b162b8aa5362d8cad2121badd Mon Sep 17 00:00:00 2001 From: bartfokker Date: Fri, 26 Oct 2018 16:53:03 +0200 Subject: [PATCH 5/5] update generated readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cb73cf8bf719..30ee44244160 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # GolangCI-Lint [![Build Status](https://travis-ci.com/golangci/golangci-lint.svg?branch=master)](https://travis-ci.com/golangci/golangci-lint) +[![GolangCI](https://golangci.com/badges/github.com/golangci/golangci-lint.svg)](https://golangci.com) GolangCI-Lint is a linters aggregator. It's fast: on average [5 times faster](#performance) than gometalinter. It's [easy to integrate and use](#command-line-options), has [nice output](#quick-start) and has a minimum number of false positives.