Merge pull request #5206 from twz123/bump-golangci-lint

Bump golangci-lint to v1.62.0
k0sproject · Nov 11, 2024 · 5cf167f · 5cf167f
2 parents 44feb49 + a1eb8b3
commit 5cf167f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/hack/tools/Makefile.variables b/hack/tools/Makefile.variables
@@ -1,2 +1,2 @@
 controller-gen_version = 0.16.1
-golangci-lint_version = 1.60.3
+golangci-lint_version = 1.62.0
diff --git a/pkg/applier/manager.go b/pkg/applier/manager.go
@@ -132,6 +132,7 @@ func (m *Manager) runWatchers(ctx context.Context) {
 	}
 
 	ctx, cancel := context.WithCancelCause(ctx)
+	defer cancel(nil) // satisfy linter, not required for correctness
 	stacks := make(map[string]stack, len(dirs))
 
 	for _, dir := range dirs {