ci: backport lint configuration changes (#7225)

Co-authored-by: Sam Kleinman <[email protected]>
Finschia · Feb 25, 2022 · 98ef31c · 98ef31c
1 parent 21fdc0b
commit 98ef31c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/lint.yaml → .github/workflows/lint.yml b/.github/workflows/lint.yaml → .github/workflows/lint.yml
@@ -9,19 +9,19 @@ jobs:
   golangci:
     name: golangci-lint
     runs-on: ubuntu-latest
-    timeout-minutes: 4
+    timeout-minutes: 8
     steps:
-      - uses: actions/checkout@v2
-      - uses: technote-space/get-diff-action@v4
+      - uses: actions/checkout@v2.4.0
+      - uses: technote-space/get-diff-action@v5
         with:
           PATTERNS: |
             **/**.go
             go.mod
             go.sum
-      - uses: golangci/[email protected].1
+      - uses: golangci/[email protected].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
@@ -8,14 +8,15 @@ on:
   pull_request:
     paths:
       - "**.md"
+      - "**.yml"
 
 jobs:
   build-linter:
     name: Super linter
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v2.4.0
       - name: Lint Code Base
         uses: docker://github/super-linter:v4
         env:
@@ -24,6 +25,5 @@ jobs:
           DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VALIDATE_MD: true
-          MARKDOWN_CONFIG_FILE: .markdownlint.yml
-          VALIDATE_OPAENAPI: true
+          VALIDATE_OPENAPI: true
           VALIDATE_YAML: true
diff --git a/.golangci.yml b/.golangci.yml
@@ -1,5 +1,6 @@
 linters:
   enable:
+    - asciicheck
     - bodyclose
     - deadcode
     - depguard
@@ -10,24 +11,25 @@ linters:
     # - funlen
     # - gochecknoglobals
     # - gochecknoinits
+    # - gocognit
     - goconst
-    - gocritic
+    # - gocritic
     # - gocyclo
     # - godox
     - gofmt
     - goimports
-    - golint
+    - revive
     - gosec
     - gosimple
     - govet
     - ineffassign
     # - interfacer
     - lll
-    - misspell
     # - maligned
+    - misspell
     - nakedret
+    - nolintlint
     - prealloc
-    # - scopelint
     - staticcheck
     - structcheck
     - stylecheck
@@ -38,8 +40,6 @@ linters:
     - varcheck
     # - whitespace
     # - wsl
-    # - gocognit
-    - nolintlint
 
 issues:
   exclude-rules:
@@ -54,9 +54,9 @@ issues:
 linters-settings:
   dogsled:
     max-blank-identifiers: 3
-  maligned:
-    suggest-new: true
-  # govet:
-  #   check-shadowing: true
   golint:
     min-confidence: 0
+  maligned:
+    suggest-new: true
+  misspell:
+    locale: US