From f96d8ba8295e0d56364fb522be489b82a1f1fc1c Mon Sep 17 00:00:00 2001
From: golangci <dev@golangci.com>
Date: Sun, 27 May 2018 10:18:35 +0300
Subject: [PATCH] fix vendoring and log concurrency
---
Gopkg.lock | 17 ++++---
Gopkg.toml | 45 ++++++++++++++++---
pkg/commands/run.go | 3 ++
.../golangci}/lint/.travis.yml | 0
.../golangci}/lint/LICENSE | 0
.../golangci}/lint/README.md | 0
.../golangci}/lint/lint.go | 2 +-
vendor/mvdan.cc/interfacer/check/check.go | 2 +-
8 files changed, 53 insertions(+), 16 deletions(-)
rename vendor/{mvdan.cc => github.com/golangci}/lint/.travis.yml (100%)
rename vendor/{mvdan.cc => github.com/golangci}/lint/LICENSE (100%)
rename vendor/{mvdan.cc => github.com/golangci}/lint/README.md (100%)
rename vendor/{mvdan.cc => github.com/golangci}/lint/lint.go (93%)
diff --git a/Gopkg.lock b/Gopkg.lock
index 1921bf58..4c024f28 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -130,6 +130,12 @@
packages = ["."]
revision = "7b41b0f84881918dab3c16c5e5148d8aa55d27b4"
+[[projects]]
+ branch = "master"
+ name = "github.com/golangci/lint"
+ packages = ["."]
+ revision = "e1cc50c0cfa0e058f40ced1b3d54b86014440c91"
+
[[projects]]
branch = "master"
name = "github.com/golangci/maligned"
@@ -386,16 +392,9 @@
branch = "master"
name = "mvdan.cc/interfacer"
packages = ["check"]
- revision = "72c3fb5d5e5e0ca07e9a7c90bcd150b049920b3b"
+ revision = "87cc93d81c1c4e460392bd89c6eb500f2c4cf629"
source = "github.com/golangci/interfacer"
-[[projects]]
- branch = "master"
- name = "mvdan.cc/lint"
- packages = ["."]
- revision = "8ff1696d5934157cea033c4b97cf5ea23fdb7a32"
- source = "github.com/golangci/lint"
-
[[projects]]
branch = "master"
name = "sourcegraph.com/sourcegraph/go-diff"
@@ -411,6 +410,6 @@
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
- inputs-digest = "f75bddb805db581bbdc751784b540bc476179ed3d918cac98b870bb8c48a26aa"
+ inputs-digest = "86deafc3c3aea3a6a1437dbf35545c9d4e1f9b510f5fe21b9ef434a465d377dc"
solver-name = "gps-cdcl"
solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index b10165f7..4680ee97 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -61,11 +61,6 @@
branch = "master"
source = "github.com/golangci/gas"
-[[override]]
- name = "mvdan.cc/lint"
- branch = "master"
- source = "github.com/golangci/lint"
-
[prune]
go-tests = true
unused-packages = true
@@ -77,3 +72,43 @@
[[constraint]]
branch = "master"
name = "github.com/mitchellh/go-ps"
+
+[[constraint]]
+ branch = "master"
+ name = "github.com/golangci/go-tools"
+
+[[constraint]]
+ branch = "master"
+ name = "github.com/golangci/unconvert"
+
+[[constraint]]
+ branch = "master"
+ name = "github.com/golangci/go-misc"
+
+[[constraint]]
+ branch = "master"
+ name = "github.com/golangci/goconst"
+
+[[constraint]]
+ branch = "master"
+ name = "github.com/golangci/check"
+
+[[constraint]]
+ branch = "master"
+ name = "github.com/golangci/gocyclo"
+
+[[constraint]]
+ branch = "master"
+ name = "github.com/golangci/gofmt"
+
+[[constraint]]
+ branch = "master"
+ name = "github.com/golangci/maligned"
+
+[[constraint]]
+ branch = "master"
+ name = "github.com/golangci/ineffassign"
+
+[[constraint]]
+ branch = "master"
+ name = "github.com/golangci/lint"
diff --git a/pkg/commands/run.go b/pkg/commands/run.go
index 2efbc28c..ef489f8c 100644
--- a/pkg/commands/run.go
+++ b/pkg/commands/run.go
@@ -292,6 +292,9 @@ func (e *Executor) runAndPrint(ctx context.Context, args []string) error {
}
func (e *Executor) executeRun(cmd *cobra.Command, args []string) {
+ logrus.Infof("Concurrency: %d, machine cpus count: %d",
+ e.cfg.Run.Concurrency, runtime.NumCPU())
+
needTrackResources := e.cfg.Run.IsVerbose || e.cfg.Run.PrintResourcesUsage
trackResourcesEndCh := make(chan struct{})
defer func() { // XXX: this defer must be before ctx.cancel defer
diff --git a/vendor/mvdan.cc/lint/.travis.yml b/vendor/github.com/golangci/lint/.travis.yml
similarity index 100%
rename from vendor/mvdan.cc/lint/.travis.yml
rename to vendor/github.com/golangci/lint/.travis.yml
diff --git a/vendor/mvdan.cc/lint/LICENSE b/vendor/github.com/golangci/lint/LICENSE
similarity index 100%
rename from vendor/mvdan.cc/lint/LICENSE
rename to vendor/github.com/golangci/lint/LICENSE
diff --git a/vendor/mvdan.cc/lint/README.md b/vendor/github.com/golangci/lint/README.md
similarity index 100%
rename from vendor/mvdan.cc/lint/README.md
rename to vendor/github.com/golangci/lint/README.md
diff --git a/vendor/mvdan.cc/lint/lint.go b/vendor/github.com/golangci/lint/lint.go
similarity index 93%
rename from vendor/mvdan.cc/lint/lint.go
rename to vendor/github.com/golangci/lint/lint.go
index 153d04ca..0503da0d 100644
--- a/vendor/mvdan.cc/lint/lint.go
+++ b/vendor/github.com/golangci/lint/lint.go
@@ -2,7 +2,7 @@
// See LICENSE for licensing information
// Package lint defines common interfaces for Go code checkers.
-package lint // import "mvdan.cc/lint"
+package lint
import (
"go/token"
diff --git a/vendor/mvdan.cc/interfacer/check/check.go b/vendor/mvdan.cc/interfacer/check/check.go
index 5d930e35..5ef78e79 100644
--- a/vendor/mvdan.cc/interfacer/check/check.go
+++ b/vendor/mvdan.cc/interfacer/check/check.go
@@ -15,8 +15,8 @@ import (
"github.com/golangci/go-tools/ssa/ssautil"
"golang.org/x/tools/go/loader"
+ "github.com/golangci/lint"
"github.com/kisielk/gotool"
- "mvdan.cc/lint"
)
func toDiscard(usage *varUsage) bool {