Skip to content

Commit f96d8ba

Browse files
committed
fix vendoring and log concurrency
1 parent c2e7e48 commit f96d8ba

File tree

8 files changed

+53
-16
lines changed

8 files changed

+53
-16
lines changed

Gopkg.lock

Lines changed: 8 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@
6161
branch = "master"
6262
source = "github.com/golangci/gas"
6363

64-
[[override]]
65-
name = "mvdan.cc/lint"
66-
branch = "master"
67-
source = "github.com/golangci/lint"
68-
6964
[prune]
7065
go-tests = true
7166
unused-packages = true
@@ -77,3 +72,43 @@
7772
[[constraint]]
7873
branch = "master"
7974
name = "github.com/mitchellh/go-ps"
75+
76+
[[constraint]]
77+
branch = "master"
78+
name = "github.com/golangci/go-tools"
79+
80+
[[constraint]]
81+
branch = "master"
82+
name = "github.com/golangci/unconvert"
83+
84+
[[constraint]]
85+
branch = "master"
86+
name = "github.com/golangci/go-misc"
87+
88+
[[constraint]]
89+
branch = "master"
90+
name = "github.com/golangci/goconst"
91+
92+
[[constraint]]
93+
branch = "master"
94+
name = "github.com/golangci/check"
95+
96+
[[constraint]]
97+
branch = "master"
98+
name = "github.com/golangci/gocyclo"
99+
100+
[[constraint]]
101+
branch = "master"
102+
name = "github.com/golangci/gofmt"
103+
104+
[[constraint]]
105+
branch = "master"
106+
name = "github.com/golangci/maligned"
107+
108+
[[constraint]]
109+
branch = "master"
110+
name = "github.com/golangci/ineffassign"
111+
112+
[[constraint]]
113+
branch = "master"
114+
name = "github.com/golangci/lint"

pkg/commands/run.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,9 @@ func (e *Executor) runAndPrint(ctx context.Context, args []string) error {
292292
}
293293

294294
func (e *Executor) executeRun(cmd *cobra.Command, args []string) {
295+
logrus.Infof("Concurrency: %d, machine cpus count: %d",
296+
e.cfg.Run.Concurrency, runtime.NumCPU())
297+
295298
needTrackResources := e.cfg.Run.IsVerbose || e.cfg.Run.PrintResourcesUsage
296299
trackResourcesEndCh := make(chan struct{})
297300
defer func() { // XXX: this defer must be before ctx.cancel defer
File renamed without changes.

vendor/mvdan.cc/lint/lint.go renamed to vendor/github.com/golangci/lint/lint.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/mvdan.cc/interfacer/check/check.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
"github.com/golangci/go-tools/ssa/ssautil"
1616
"golang.org/x/tools/go/loader"
1717

18+
"github.com/golangci/lint"
1819
"github.com/kisielk/gotool"
19-
"mvdan.cc/lint"
2020
)
2121

2222
func toDiscard(usage *varUsage) bool {

0 commit comments

Comments
 (0)