github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #4098 from thaJeztah/update_golangci_lint

Browse Source 
Update Golangci-lint v1.23.8
This commit is contained in:
Michael Crosby 2020-03-10 12:38:44 -04:00 committed by GitHub
commit c6851ace61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.golangci.yml
View File

@ -15,7 +15,7 @@ linters:
- errcheck - errcheck
run: run:
deadline: 2m timeout: 2m
skip-dirs: skip-dirs:
- api - api
- design - design

3
cmd/containerd/command/service_windows.go
View File

@ -49,8 +49,6 @@ var (
allocConsole = kernel32.NewProc("AllocConsole") allocConsole = kernel32.NewProc("AllocConsole")
oldStderr windows.Handle oldStderr windows.Handle
panicFile *os.File panicFile *os.File
service *handler
) )
const defaultServiceName = "containerd" const defaultServiceName = "containerd"
@ -282,7 +280,6 @@ func launchService(s *server.Server, done chan struct{}) error {
return err return err
} }
service = h
go func() { go func() {
if interactive { if interactive {
err = debug.Run(serviceNameFlag, h) err = debug.Run(serviceNameFlag, h)

2
script/setup/install-dev-tools
View File

@ -26,6 +26,6 @@ go get -u github.com/cpuguy83/go-md2man
( (
cd "$GOPATH"/src/github.com/golangci/golangci-lint/cmd/golangci-lint cd "$GOPATH"/src/github.com/golangci/golangci-lint/cmd/golangci-lint
git checkout v1.18.0 git checkout v1.23.8
go build -v && go install go build -v && go install
) )