From 4756258faf55c1e2b4eb601c9fb669ecb3b43e8b Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 10 Mar 2020 12:33:26 +0100 Subject: [PATCH 1/2] service_windows.go: remove unused "service" variable This was added in 40d898a820a557e92eb94d61ed29e1d24327c1a8, but doesn't appear to be used. Signed-off-by: Sebastiaan van Stijn --- cmd/containerd/command/service_windows.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/cmd/containerd/command/service_windows.go b/cmd/containerd/command/service_windows.go index 697345910..655295fc8 100644 --- a/cmd/containerd/command/service_windows.go +++ b/cmd/containerd/command/service_windows.go @@ -49,8 +49,6 @@ var ( allocConsole = kernel32.NewProc("AllocConsole") oldStderr windows.Handle panicFile *os.File - - service *handler ) const defaultServiceName = "containerd" @@ -282,7 +280,6 @@ func launchService(s *server.Server, done chan struct{}) error { return err } - service = h go func() { if interactive { err = debug.Run(serviceNameFlag, h) From 4326fc624a6504c154c6743774e225c8782f6a36 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 10 Mar 2020 12:08:21 +0100 Subject: [PATCH 2/2] Update Golangci-lint v1.23.8 full diff: https://github.com/golangci/golangci-lint/compare/v1.18.0...v1.23.8 Signed-off-by: Sebastiaan van Stijn --- .golangci.yml | 2 +- script/setup/install-dev-tools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 940e3a195..f2af22566 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -15,7 +15,7 @@ linters: - errcheck run: - deadline: 2m + timeout: 2m skip-dirs: - api - design diff --git a/script/setup/install-dev-tools b/script/setup/install-dev-tools index 7a9cd7f96..00589fd87 100755 --- a/script/setup/install-dev-tools +++ b/script/setup/install-dev-tools @@ -26,6 +26,6 @@ go get -u github.com/cpuguy83/go-md2man ( 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 )