From 06fb78aa26eb0af2cb7c9e6a18f5b6e5ca222696 Mon Sep 17 00:00:00 2001
From: Sam Coe <samcoe@users.noreply.github.com>
Date: Wed, 11 May 2022 16:57:57 +0200
Subject: [PATCH] Re-enable linters now that golangci-lint has been updated
 (#5615)

---
 .github/workflows/lint.yml | 2 +-
 .golangci.yml              | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6eab67141..eba94fe96 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -40,7 +40,7 @@ jobs:
           go mod verify
           go mod download
 
-          LINT_VERSION=1.45.2
+          LINT_VERSION=1.46.0
           curl -fsSL https://github.com/golangci/golangci-lint/releases/download/v${LINT_VERSION}/golangci-lint-${LINT_VERSION}-linux-amd64.tar.gz | \
             tar xz --strip-components 1 --wildcards \*/golangci-lint
           mkdir -p bin && mv golangci-lint bin/
diff --git a/.golangci.yml b/.golangci.yml
index 29bd80f0b..ff7f37014 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,6 +1,7 @@
 linters:
   enable:
   - gofmt
+  - nolintlint
 
 issues:
   max-issues-per-linter: 0