From b82162dde88d6282e456eadcc2228e6b073dad74 Mon Sep 17 00:00:00 2001 From: Oliver Eikemeier Date: Tue, 12 Nov 2024 08:27:24 +0100 Subject: [PATCH] Update zerolint version Signed-off-by: Oliver Eikemeier --- .custom-gcl.yaml | 2 +- .github/workflows/test.yml | 4 ++-- .golangci-default.yaml | 2 -- .golangci.yaml | 3 ++- .prettierrc.yaml | 6 ++++++ README.md | 4 ++-- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 8 files changed, 25 insertions(+), 20 deletions(-) diff --git a/.custom-gcl.yaml b/.custom-gcl.yaml index d9658b1..474bb1e 100644 --- a/.custom-gcl.yaml +++ b/.custom-gcl.yaml @@ -1,5 +1,5 @@ --- -version: v1.61.0 +version: v1.62.0 plugins: - module: fillmore-labs.com/zerolint-golangci-plugin path: . diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ff0ed5c..dde5a6b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-24.04 strategy: matrix: - go: ["1.23", "1.22"] + go: ["1.23.3", "1.22.9"] env: GOTOOLCHAIN: local steps: @@ -32,7 +32,7 @@ jobs: - name: 🧸 golangci-lint uses: golangci/golangci-lint-action@v6 with: - version: v1.61.0 + version: v1.62.0 args: --config=.golangci-default.yaml - name: 🔨 Test run: golangci-lint custom -v && ./custom-gcl run -v . diff --git a/.golangci-default.yaml b/.golangci-default.yaml index 452ee08..70eead1 100644 --- a/.golangci-default.yaml +++ b/.golangci-default.yaml @@ -5,9 +5,7 @@ linters: enable-all: true disable: # deprecated - - execinquery - exportloopref - - gomnd # disabled - depguard - dupl diff --git a/.golangci.yaml b/.golangci.yaml index c6ff987..a73680c 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -1,5 +1,6 @@ --- run: + go: "1.22.9" modules-download-mode: readonly linters: enable: @@ -7,7 +8,7 @@ linters: linters-settings: custom: zerolint: - type: "module" + type: module settings: excluded: [] basic: true diff --git a/.prettierrc.yaml b/.prettierrc.yaml index 0769836..f3f4c79 100644 --- a/.prettierrc.yaml +++ b/.prettierrc.yaml @@ -7,3 +7,9 @@ overrides: - files: "*.md" options: tabWidth: 2 + - files: "*.yaml" + options: + tabWidth: 2 + - files: "*.yml" + options: + tabWidth: 2 diff --git a/README.md b/README.md index 3c14ae7..07709cd 100644 --- a/README.md +++ b/README.md @@ -10,10 +10,10 @@ Add a file `.custom-gcl.yaml` to your source with ```YAML --- -version: v1.61.0 +version: v1.62.0 plugins: - module: fillmore-labs.com/zerolint-golangci-plugin - version: v0.0.5 + version: v0.0.6 ``` then run `golangci-lint custom`. You get an `custom-gcl` executable that can be configured in `.golangci.yaml`: diff --git a/go.mod b/go.mod index 6a5c535..9ab8d18 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module fillmore-labs.com/zerolint-golangci-plugin -go 1.22.7 +go 1.22.9 -toolchain go1.23.1 +toolchain go1.23.3 require ( - fillmore-labs.com/zerolint v0.0.5 + fillmore-labs.com/zerolint v0.0.6 github.com/golangci/plugin-module-register v0.1.1 - golang.org/x/tools v0.25.0 + golang.org/x/tools v0.27.0 ) diff --git a/go.sum b/go.sum index 9d28b44..92fb9ff 100644 --- a/go.sum +++ b/go.sum @@ -1,10 +1,10 @@ -fillmore-labs.com/zerolint v0.0.5 h1:+MuKofZiuKQF6+5Xu0rtE82sVx2UlBcvF/1dK7x6pOQ= -fillmore-labs.com/zerolint v0.0.5/go.mod h1:SOKYmjl0BNu50oBlKGUoAMhY2yepZwbANWCsMbSwLOE= +fillmore-labs.com/zerolint v0.0.6 h1:pFGSYnXtnpMuzo5NxJ1IDMaOA3DZuijL1IJm1h1l/yY= +fillmore-labs.com/zerolint v0.0.6/go.mod h1:bX+KNByQeomQ6eDFkfw+OORPA1J4UIN1pSdPZz0wo9M= github.com/golangci/plugin-module-register v0.1.1 h1:TCmesur25LnyJkpsVrupv1Cdzo+2f7zX0H6Jkw1Ol6c= github.com/golangci/plugin-module-register v0.1.1/go.mod h1:TTpqoB6KkwOJMV8u7+NyXMrkwwESJLOkfl9TxR1DGFc= -golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= -golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= -golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE= -golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg= +golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4= +golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= +golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= +golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o= +golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q=