Merge tag 'v1.19.1'

* tag 'v1.19.1':
  Use separate go.mod/go.sum to manage tool deps. (golangci#736)
  Use stretchr/testify to mock log.
  Fix golangci#733: update forked bodyclose
  Cleanup obsolete go.mod/go.sum diff. (golangci#729)
  dev: update deprecated parts of .goreleaser.yml
  dev: trigger CI build on tag push
  Update minimum Go version to 1.12.
  Enable consistent GOPROXY Go 1.12/1.13 behavior.
  Fix golangci#608: use forked bodyclose
  Drop memory usage of go/analysis linters 5x
  Manage build tools via go.mod.
  Update whitespace
  Reduce memory usage of go/analysis

Author: korjavin

.gitignore

@@ -5,5 +5,7 @@
 /.idea/
 /test/path
 /golangci-lint
-/tools/
+/tools/Dracula.itermcolors
+/tools/node_modules
+/tools/svg-term
 /.vscode/

.golangci.example.yml

@@ -205,6 +205,9 @@ linters-settings:
     # checks assignments with too many blank identifiers; default is 2
     max-blank-identifiers: 2
 
+  whitespace:
+    multi-if: false
+
 linters:
   enable:
     - megacheck

.goreleaser.yml

@@ -26,16 +26,16 @@ builds:
     main: ./cmd/golangci-lint/
     ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.ShortCommit}} -X main.date={{.Date}}
 
-archive:
-  format: tar.gz
-  wrap_in_directory: true
-  format_overrides:
-    - goos: windows
-      format: zip
-  name_template: '{{ .Binary }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
-  files:
-    - LICENSE
-    - README.md
+archives:
+  - format: tar.gz
+    wrap_in_directory: true
+    format_overrides:
+      - goos: windows
+        format: zip
+    name_template: '{{ .Binary }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}'
+    files:
+      - LICENSE
+      - README.md
 
 snapshot:
   name_template: SNAPSHOT-{{ .Commit }}
@@ -60,17 +60,17 @@ dockers:
       - "golangci/golangci-lint:{{ .Tag }}"
       - "golangci/golangci-lint:v{{ .Major }}.{{ .Minor }}"
 
-brew:
-  github:
-    owner: golangci
-    name: homebrew-tap
-  folder: Formula
-  homepage:  https://golangci.com
-  description: Fast linters runner for Go.
-  install: |
-    bin.install "golangci-lint"
-    output = Utils.popen_read("#{bin}/golangci-lint completion bash")
-    (bash_completion/"golangci-lint").write output
-    prefix.install_metafiles
-  test: |
-    system "#{bin}/golangci-lint --version"
+brews:
+  - github:
+      owner: golangci
+      name: homebrew-tap
+    folder: Formula
+    homepage:  https://golangci.com
+    description: Fast linters runner for Go.
+    install: |
+      bin.install "golangci-lint"
+      output = Utils.popen_read("#{bin}/golangci-lint completion bash")
+      (bash_completion/"golangci-lint").write output
+      prefix.install_metafiles
+    test: |
+      system "#{bin}/golangci-lint --version"

.travis.yml

@@ -17,6 +17,7 @@ script:
 branches:
   only: # speed up CI: don't build pull requests twice
     - "master"
+    - /^v\d+\.\d+\.\d+$/
 
 after_success:
   - test -n "$TRAVIS_TAG" && docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
@@ -31,7 +32,7 @@ deploy:
   skip_cleanup: true
   script:
     - make test_race
-    - curl -sL https://git.io/goreleaser | bash
+    - make release
   on:
     tags: true
     # it's important to build on the newest version of go:

Makefile

@@ -1,8 +1,12 @@
 .DEFAULT_GOAL = test
 .PHONY: FORCE
 
-# Enable Go module support across all commands.
+# enable module support across all go commands.
 export GO111MODULE = on
+# opt-in to vendor deps across all go commands.
+export GOFLAGS = -mod=vendor
+# enable consistent Go 1.12/1.13 GOPROXY behavior.
+export GOPROXY = https://proxy.golang.org
 
 # Build
 
@@ -12,8 +16,11 @@ build_race: FORCE
 	go build -race -o golangci-lint ./cmd/golangci-lint
 build: golangci-lint
 clean:
-	rm -f golangci-lint test/path
-	rm -rf tools
+	rm -f golangci-lint
+	rm -f test/path
+	rm -f tools/svg-term
+	rm -f tools/Dracula.itermcolors
+	rm -rf tools/node_modules
 .PHONY: fast_build build build_race clean
 
 # Test
@@ -36,81 +43,58 @@ test_linters:
 
 # Maintenance
 
-generate: README.md docs/demo.svg install.sh pkg/logutils/mock_logutils/mock_log.go vendor
+generate: README.md docs/demo.svg install.sh vendor
 fast_generate: README.md vendor
 
 maintainer-clean: clean
-	rm -f docs/demo.svg README.md install.sh pkg/logutils/mock_logutils/mock_log.go
+	rm -f docs/demo.svg README.md install.sh
 	rm -rf vendor
 .PHONY: generate maintainer-clean
 
 check_generated:
 	$(MAKE) --always-make generate
-	git checkout -- go.mod go.sum # can differ between go1.11 and go1.12
 	git checkout -- vendor/modules.txt # can differ between go1.12 and go1.13
 	git diff --exit-code # check no changes
 .PHONY: check_generated
 
 fast_check_generated:
 	$(MAKE) --always-make fast_generate
-	git checkout -- go.mod go.sum # can differ between go1.11 and go1.12
 	git checkout -- vendor/modules.txt # can differ between go1.12 and go1.13
 	git diff --exit-code # check no changes
 .PHONY: fast_check_generated
 
-release:
-	rm -rf dist
-	curl -sL https://git.io/goreleaser | bash
+release: export GOFLAGS = -mod=readonly
+release: .goreleaser.yml
+	cd tools && go run github.com/goreleaser/goreleaser --config ../.goreleaser.yml
 .PHONY: release
 
 # Non-PHONY targets (real files)
 
-golangci-lint: FORCE pkg/logutils/mock_logutils/mock_log.go
+golangci-lint: FORCE
 	go build -o $@ ./cmd/golangci-lint
 
-tools/mockgen: go.mod go.sum
-	GOBIN=$(CURDIR)/tools go install github.com/golang/mock/mockgen
-
-tools/goimports: go.mod go.sum
-	GOBIN=$(CURDIR)/tools go install golang.org/x/tools/cmd/goimports
-
-tools/go.mod:
-	@mkdir -p tools
-	@rm -f $@
-	cd tools && go mod init local-tools
-
-tools/godownloader: Makefile tools/go.mod
-	# https://github.com/goreleaser/godownloader/issues/133
-	cd tools && GOBIN=$(CURDIR)/tools go get -u github.com/goreleaser/godownloader
-
-tools/svg-term:
-	@mkdir -p tools
+tools/svg-term: tools/package.json tools/package-lock.json
 	cd tools && npm ci
 	ln -sf node_modules/.bin/svg-term $@
 
 tools/Dracula.itermcolors:
-	@mkdir -p tools
 	curl -fL -o $@ https://raw.githubusercontent.com/dracula/iterm/master/Dracula.itermcolors
 
 docs/demo.svg: tools/svg-term tools/Dracula.itermcolors
-	PATH=$(CURDIR)/tools:$${PATH} svg-term --cast=183662 --out docs/demo.svg --window --width 110 --height 30 --from 2000 --to 20000 --profile ./tools/Dracula.itermcolors --term iterm2
+	./tools/svg-term --cast=183662 --out docs/demo.svg --window --width 110 --height 30 --from 2000 --to 20000 --profile ./tools/Dracula.itermcolors --term iterm2
 
-install.sh: tools/godownloader .goreleaser.yml
-	PATH=$(CURDIR)/tools:$${PATH} tools/godownloader .goreleaser.yml | sed '/DO NOT EDIT/s/ on [0-9TZ:-]*//' > $@
+install.sh: export GOFLAGS = -mod=readonly
+install.sh: .goreleaser.yml
+	cd tools && go run github.com/goreleaser/godownloader ../.goreleaser.yml | sed '/DO NOT EDIT/s/ on [0-9TZ:-]*//' > ../$@
 
 README.md: FORCE golangci-lint
 	go run ./scripts/gen_readme/main.go
 
-pkg/logutils/mock_logutils/mock_log.go: tools/mockgen tools/goimports pkg/logutils/log.go
-	@rm -f $@
-	PATH=$(CURDIR)/tools:$${PATH} go generate ./...
-
 go.mod: FORCE
 	go mod tidy
 	go mod verify
 go.sum: go.mod
 
 .PHONY: vendor
 vendor: go.mod go.sum
-	rm -rf vendor
 	go mod vendor

README.md

@@ -84,10 +84,10 @@ Local installation is not recommended for your CI pipeline. Only install the lin
 go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
 ```
 
-With `go1.11` or later you can get a particular version
+With `go1.12` or later you can get a particular version
 
 ```bash
-GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.17.1
+GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.18.0
 ```
 
 #### MacOS
@@ -560,6 +560,7 @@ Global Flags:
   -j, --concurrency int           Concurrency (default NumCPU) (default 8)
       --cpu-profile-path string   Path to CPU profile output file
       --mem-profile-path string   Path to memory profile output file
+      --trace-path string         Path to trace output file
   -v, --verbose                   verbose output
 
 ```
@@ -789,6 +790,9 @@ linters-settings:
     # checks assignments with too many blank identifiers; default is 2
     max-blank-identifiers: 2
 
+  whitespace:
+    multi-if: false
+
 linters:
   enable:
     - megacheck
@@ -1067,7 +1071,7 @@ Long answer:
 2. go1.9 is officially supported by golangci-lint <= v1.10.2
 3. go1.10 is officially supported by golangci-lint <= 1.15.0.
 4. go1.11 is officially supported by golangci-lint <= 1.17.1.
-5. go1.12 and go1.13 are officially supported by the latest version of golangci-lint (>= 1.18.0).
+5. go1.12+ are officially supported by the latest version of golangci-lint (>= 1.18.0).
 
 **`golangci-lint` doesn't work**
 

README.tmpl.md

@@ -84,10 +84,10 @@ Local installation is not recommended for your CI pipeline. Only install the lin
 go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
 ```
 
-With `go1.11` or later you can get a particular version
+With `go1.12` or later you can get a particular version
 
 ```bash
-GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.17.1
+GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.18.0
 ```
 
 #### MacOS
@@ -535,7 +535,7 @@ Long answer:
 2. go1.9 is officially supported by golangci-lint <= v1.10.2
 3. go1.10 is officially supported by golangci-lint <= 1.15.0.
 4. go1.11 is officially supported by golangci-lint <= 1.17.1.
-5. go1.12 and go1.13 are officially supported by the latest version of golangci-lint (>= 1.18.0).
+5. go1.12+ are officially supported by the latest version of golangci-lint (>= 1.18.0).
 
 **`golangci-lint` doesn't work**
 

go.mod

@@ -1,13 +1,12 @@
 module github.com/golangci/golangci-lint
 
-go 1.11
+go 1.12
 
 require (
 	github.com/OpenPeeDeeP/depguard v1.0.1
 	github.com/fatih/color v1.7.0
 	github.com/go-critic/go-critic v0.3.5-0.20190904082202-d79a9f0c64db
 	github.com/go-lintpack/lintpack v0.5.2
-	github.com/golang/mock v1.3.1
 	github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2
 	github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a
 	github.com/golangci/errcheck v0.0.0-20181223084120-ef45e06d44b6
@@ -37,7 +36,7 @@ require (
 	github.com/stretchr/testify v1.4.0
 	github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec
 	github.com/ultraware/funlen v0.0.2
-	github.com/ultraware/whitespace v0.0.2
+	github.com/ultraware/whitespace v0.0.3
 	github.com/valyala/quicktemplate v1.2.0
 	golang.org/x/tools v0.0.0-20190912215617-3720d1ec3678
 	gopkg.in/yaml.v2 v2.2.2
@@ -47,7 +46,12 @@ require (
 	mvdan.cc/unparam v0.0.0-20190720180237-d51796306d8f
 )
 
-// https://github.com/golang/tools/pull/162
-// https://github.com/golang/tools/pull/160
-// https://github.com/golang/tools/pull/156
-replace golang.org/x/tools => github.com/golangci/tools v0.0.0-20190915081525-6aa350649b1c
+replace (
+	// https://github.com/timakin/bodyclose/pull/20
+	github.com/timakin/bodyclose => github.com/golangci/bodyclose v0.0.0-20190924091105-43b3ff1b0de0
+
+	// https://github.com/golang/tools/pull/156
+	// https://github.com/golang/tools/pull/160
+	// https://github.com/golang/tools/pull/162
+	golang.org/x/tools => github.com/golangci/tools v0.0.0-20190915081525-6aa350649b1c
+)

go.sum

@@ -70,12 +70,12 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golangci/bodyclose v0.0.0-20190924091105-43b3ff1b0de0 h1:SOIRs5twdFsHlEhPmysNtHiveNIMdXcwUZgvN+tKFWc=
+github.com/golangci/bodyclose v0.0.0-20190924091105-43b3ff1b0de0/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0=
 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4=
 github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM=
@@ -221,20 +221,19 @@ github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48=
 github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec h1:AmoEvWAO3nDx1MEcMzPh+GzOOIA5Znpv6++c7bePPY0=
-github.com/timakin/bodyclose v0.0.0-20190721030226-87058b9bfcec/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
 github.com/ultraware/funlen v0.0.2 h1:Av96YVBwwNSe4MLR7iI/BIa3VyI7/djnto/pK3Uxbdo=
 github.com/ultraware/funlen v0.0.2/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA=
-github.com/ultraware/whitespace v0.0.2 h1:iL4Un0C3VaMIBGfDogtcdBeSotjfSHYW8OdI1U9Vqas=
-github.com/ultraware/whitespace v0.0.2/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA=
+github.com/ultraware/whitespace v0.0.3 h1:S5BCRRB5sttNy0bSOhbpw+0mb+cHiCmWfrvxpEzuUk0=
+github.com/ultraware/whitespace v0.0.3/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
 github.com/valyala/fasthttp v1.2.0/go.mod h1:4vX61m6KN+xDduDNwXrhIAVZaZaZiQ1luJk8LWSxF3s=