From 5591d08b4ae5c64e2283c293287843503fb630e9 Mon Sep 17 00:00:00 2001
From: Sam Kleinman <garen@tychoish.com>
Date: Wed, 3 Nov 2021 15:41:41 +0100
Subject: [PATCH] ci: backport lint configuration changes (#7226)

(cherry picked from commit 6f66c60397d7057b7f55994da3c528e25d8b10ce)
---
 .github/workflows/lint.yml   | 4 ++--
 .github/workflows/linter.yml | 2 +-
 .golangci.yml                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 79cb3685b..b808d9f77 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 8
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2.4.0
       - uses: technote-space/get-diff-action@v5
         with:
           PATTERNS: |
@@ -23,7 +23,7 @@ jobs:
       - uses: golangci/golangci-lint-action@v2.5.2
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.38
+          version: v1.42.1
           args: --timeout 10m
           github-token: ${{ secrets.github_token }}
         if: env.GIT_DIFF
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
index 953170c59..7cfc7c161 100644
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v2.4.0
       - name: Lint Code Base
         uses: docker://github/super-linter:v3
         env:
diff --git a/.golangci.yml b/.golangci.yml
index 6a5c9feea..e0f3fe163 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -18,7 +18,7 @@ linters:
     # - godox
     - gofmt
     - goimports
-    # - golint
+    - revive
     - gosec
     - gosimple
     - govet