ci: update golangci-lint-action to v6 and golangci-lint to v1.58.0 (#4494)

* ci: update golangci-lint-action to v6 and golangci-lint to v1.58.0

* use issues.exclude-files instead of run.skip-files

* rename vet to govet
This commit is contained in:
Marten Seemann
2024-05-07 10:05:38 +08:00
committed by GitHub
parent 475b4f02cb
commit 2ed1593b6e
2 changed files with 9 additions and 15 deletions

View File

@@ -40,7 +40,7 @@ jobs:
matrix: matrix:
go: [ "1.21.x", "1.22.x" ] go: [ "1.21.x", "1.22.x" ]
env: env:
GOLANGCI_LINT_VERSION: v1.56.1 GOLANGCI_LINT_VERSION: v1.58.0
name: golangci-lint (Go ${{ matrix.go }}) name: golangci-lint (Go ${{ matrix.go }})
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -48,44 +48,39 @@ jobs:
with: with:
go-version: ${{ matrix.go }} go-version: ${{ matrix.go }}
- name: golangci-lint (Linux) - name: golangci-lint (Linux)
uses: golangci/golangci-lint-action@v5 uses: golangci/golangci-lint-action@v6
with: with:
skip-pkg-cache: true
args: --timeout=3m args: --timeout=3m
version: ${{ env.GOLANGCI_LINT_VERSION }} version: ${{ env.GOLANGCI_LINT_VERSION }}
- name: golangci-lint (Windows) - name: golangci-lint (Windows)
if: success() || failure() # run this step even if the previous one failed if: success() || failure() # run this step even if the previous one failed
uses: golangci/golangci-lint-action@v5 uses: golangci/golangci-lint-action@v6
env: env:
GOOS: "windows" GOOS: "windows"
with: with:
skip-pkg-cache: true
args: --timeout=3m args: --timeout=3m
version: ${{ env.GOLANGCI_LINT_VERSION }} version: ${{ env.GOLANGCI_LINT_VERSION }}
- name: golangci-lint (OSX) - name: golangci-lint (OSX)
if: success() || failure() # run this step even if the previous one failed if: success() || failure() # run this step even if the previous one failed
uses: golangci/golangci-lint-action@v5 uses: golangci/golangci-lint-action@v6
env: env:
GOOS: "darwin" GOOS: "darwin"
with: with:
skip-pkg-cache: true
args: --timeout=3m args: --timeout=3m
version: ${{ env.GOLANGCI_LINT_VERSION }} version: ${{ env.GOLANGCI_LINT_VERSION }}
- name: golangci-lint (FreeBSD) - name: golangci-lint (FreeBSD)
if: success() || failure() # run this step even if the previous one failed if: success() || failure() # run this step even if the previous one failed
uses: golangci/golangci-lint-action@v5 uses: golangci/golangci-lint-action@v6
env: env:
GOOS: "freebsd" GOOS: "freebsd"
with: with:
skip-pkg-cache: true
args: --timeout=3m args: --timeout=3m
version: ${{ env.GOLANGCI_LINT_VERSION }} version: ${{ env.GOLANGCI_LINT_VERSION }}
- name: golangci-lint (others) - name: golangci-lint (others)
if: success() || failure() # run this step even if the previous one failed if: success() || failure() # run this step even if the previous one failed
uses: golangci/golangci-lint-action@v5 uses: golangci/golangci-lint-action@v6
env: env:
GOOS: "solaris" # some OS that we don't have any build tags for GOOS: "solaris" # some OS that we don't have any build tags for
with: with:
skip-pkg-cache: true
args: --timeout=3m args: --timeout=3m
version: ${{ env.GOLANGCI_LINT_VERSION }} version: ${{ env.GOLANGCI_LINT_VERSION }}

View File

@@ -1,6 +1,3 @@
run:
skip-files:
- internal/handshake/cipher_suite.go
linters-settings: linters-settings:
misspell: misspell:
ignore-words: ignore-words:
@@ -26,6 +23,7 @@ linters:
- gofmt # redundant, since gofmt *should* be a no-op after gofumpt - gofmt # redundant, since gofmt *should* be a no-op after gofumpt
- gofumpt - gofumpt
- gosimple - gosimple
- govet
- ineffassign - ineffassign
- misspell - misspell
- prealloc - prealloc
@@ -34,9 +32,10 @@ linters:
- unconvert - unconvert
- unparam - unparam
- unused - unused
- vet
issues: issues:
exclude-files:
- internal/handshake/cipher_suite.go
exclude-rules: exclude-rules:
- path: internal/qtls - path: internal/qtls
linters: linters: