From 048940927c73cfb6d82b8275084830a009d0bceb Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Wed, 13 Dec 2023 17:32:06 +0530 Subject: [PATCH] ci: update golangci-lint to v1.55.2 (#4204) --- .github/workflows/lint.yml | 10 +++++----- .golangci.yml | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index fd735c9b7..5b6478e59 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -51,7 +51,7 @@ jobs: with: skip-pkg-cache: true args: --timeout=3m - version: v1.52.2 + version: v1.55.2 - name: golangci-lint (Windows) if: success() || failure() # run this step even if the previous one failed uses: golangci/golangci-lint-action@v3 @@ -60,7 +60,7 @@ jobs: with: skip-pkg-cache: true args: --timeout=3m - version: v1.52.2 + version: v1.55.2 - name: golangci-lint (OSX) if: success() || failure() # run this step even if the previous one failed uses: golangci/golangci-lint-action@v3 @@ -69,7 +69,7 @@ jobs: with: skip-pkg-cache: true args: --timeout=3m - version: v1.52.2 + version: v1.55.2 - name: golangci-lint (FreeBSD) if: success() || failure() # run this step even if the previous one failed uses: golangci/golangci-lint-action@v3 @@ -78,7 +78,7 @@ jobs: with: skip-pkg-cache: true args: --timeout=3m - version: v1.52.2 + version: v1.55.2 - name: golangci-lint (others) if: success() || failure() # run this step even if the previous one failed uses: golangci/golangci-lint-action@v3 @@ -87,4 +87,4 @@ jobs: with: skip-pkg-cache: true args: --timeout=3m - version: v1.52.2 + version: v1.55.2 diff --git a/.golangci.yml b/.golangci.yml index 1315759bc..f5e9b48bc 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -3,15 +3,15 @@ run: - internal/handshake/cipher_suite.go linters-settings: depguard: - type: blacklist - packages: - - github.com/marten-seemann/qtls - - github.com/quic-go/qtls-go1-19 - - github.com/quic-go/qtls-go1-20 - packages-with-error-message: - - github.com/marten-seemann/qtls: "importing qtls only allowed in internal/qtls" - - github.com/quic-go/qtls-go1-19: "importing qtls only allowed in internal/qtls" - - github.com/quic-go/qtls-go1-20: "importing qtls only allowed in internal/qtls" + rules: + qtls: + list-mode: lax + files: + - "!internal/qtls/**" + - "$all" + deny: + - pkg: github.com/quic-go/qtls-go1-20 + desc: "importing qtls only allowed in internal/qtls" misspell: ignore-words: - ect