From cf2f1f3c3fb093c5abc5b4c6461d33a061abd79c Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Mon, 26 Dec 2022 01:19:25 +0100 Subject: [PATCH 01/11] chore: update workflows --- .github/workflows/post-release.yml | 2 +- .github/workflows/pr-extra.yml | 2 +- .github/workflows/pr.yml | 4 ++-- .github/workflows/tag.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml index d00c7a095cfd..4fa9c083b681 100644 --- a/.github/workflows/post-release.yml +++ b/.github/workflows/post-release.yml @@ -18,7 +18,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.19 + go-version: 1.18.0-rc.1 - name: Update GitHub action config run: make assets/github-action-config.json diff --git a/.github/workflows/pr-extra.yml b/.github/workflows/pr-extra.yml index 2b3016ab5d3d..da4024b937d0 100644 --- a/.github/workflows/pr-extra.yml +++ b/.github/workflows/pr-extra.yml @@ -17,7 +17,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.19 + go-version: 1.20.0-rc.1 - name: Run go list run: go list -json -m all > go.list - name: Nancy diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index c01ff99ae2a2..0248e3b83169 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,7 +6,7 @@ on: pull_request: env: - GO_VERSION: 1.19 + GO_VERSION: 1.20.0-rc.1 jobs: # Check if there is any dirty change for go mod tidy @@ -89,7 +89,7 @@ jobs: matrix: golang: - 1.18 - - 1.19 + - 1.20.0-rc.1 steps: - uses: actions/checkout@v3 - name: Install Go diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index afea9675bdbf..6742097aee9b 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -18,7 +18,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.19 + go-version: 1.20.0-rc.1 - name: Unshallow run: git fetch --prune --unshallow @@ -48,7 +48,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.19 + go-version: 1.20.0-rc.1 - name: Unshallow run: git fetch --prune --unshallow From 6ca2b1a5c0ec0335b51301ef931afb5f363af483 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Mon, 26 Dec 2022 01:19:57 +0100 Subject: [PATCH 02/11] chore: update dependencies --- go.mod | 8 ++++---- go.sum | 11 ++++++----- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index ecd772a245a6..fcf9030d77e1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/golangci/golangci-lint -go 1.19 +go 1.20 require ( 4d63.com/gocheckcompilerdirectives v1.2.1 @@ -39,7 +39,7 @@ require ( github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca - github.com/golangci/misspell v0.3.5 + github.com/golangci/misspell v0.4.0 github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 @@ -112,7 +112,7 @@ require ( gitlab.com/bosi/decorder v0.2.3 golang.org/x/tools v0.5.0 gopkg.in/yaml.v3 v3.0.1 - honnef.co/go/tools v0.3.3 + honnef.co/go/tools v0.4.0-0.dev.0.20221209223220-58c4d7e4b720 mvdan.cc/gofumpt v0.4.0 mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d @@ -179,7 +179,7 @@ require ( go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.17.0 // indirect golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect - golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect + golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a // indirect golang.org/x/mod v0.7.0 // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.4.0 // indirect diff --git a/go.sum b/go.sum index 10aa93835407..4c933094098c 100644 --- a/go.sum +++ b/go.sum @@ -218,8 +218,8 @@ github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPz github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA= github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= -github.com/golangci/misspell v0.3.5 h1:pLzmVdl3VxTOncgzHcvLOKirdvcx/TydsClUQXTehjo= -github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= +github.com/golangci/misspell v0.4.0 h1:KtVB/hTK4bbL/S6bs64rYyk8adjmh1BygbBiaAiX+a0= +github.com/golangci/misspell v0.4.0/go.mod h1:W6O/bwV6lGDxUCChm2ykw9NQdd5bYd1Xkjo88UcWyJc= github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 h1:DIPQnGy2Gv2FSA4B/hh8Q7xx3B7AIDk3DAMeHclH1vQ= github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6/go.mod h1:0AKcRCkMoKvUvlf89F6O7H2LYdhr1zBh736mBItOdRs= github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys= @@ -614,8 +614,9 @@ golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMk golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= -golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 h1:Ic/qN6TEifvObMGQy72k0n1LlJr7DjWWEi+MOsDOiSk= golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a h1:Jw5wfR+h9mnIYH+OtGT2im5wV1YGGDora5vTv/aa5bE= +golang.org/x/exp/typeparams v0.0.0-20221208152030-732eee02a75a/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1001,8 +1002,8 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.3.3 h1:oDx7VAwstgpYpb3wv0oxiZlxY+foCpRAwY7Vk6XpAgA= -honnef.co/go/tools v0.3.3/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw= +honnef.co/go/tools v0.4.0-0.dev.0.20221209223220-58c4d7e4b720 h1:L3lQbXWMmkBfyGXTvipQVmLXSM5SsT/39qcf+0RBIlQ= +honnef.co/go/tools v0.4.0-0.dev.0.20221209223220-58c4d7e4b720/go.mod h1:lbrxuU0wR28B7d2OiCxa+DVcNWwTjaY3RfXQNu3r10U= mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM= mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ= mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I= From 3863e55f1b6eb5a43f4d0137ea7382d2caeec842 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Mon, 26 Dec 2022 01:20:31 +0100 Subject: [PATCH 03/11] fix: packages.Load, go list, and typcheck --- pkg/golinters/goanalysis/runner_loadingpackage.go | 1 + pkg/golinters/gofmt_common.go | 2 +- pkg/lint/load.go | 12 ++++++++++++ pkg/lint/runner.go | 1 + test/testdata/notcompiles/typecheck_many_issues.go | 8 ++++---- 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pkg/golinters/goanalysis/runner_loadingpackage.go b/pkg/golinters/goanalysis/runner_loadingpackage.go index a5b5cccfeef7..e76b6ab6ee99 100644 --- a/pkg/golinters/goanalysis/runner_loadingpackage.go +++ b/pkg/golinters/goanalysis/runner_loadingpackage.go @@ -434,6 +434,7 @@ func (lp *loadingPackage) convertError(err error) []packages.Error { // If you see this error message, please file a bug. lp.log.Warnf("Internal error: error %q (%T) without position", err, err) } + return errs } diff --git a/pkg/golinters/gofmt_common.go b/pkg/golinters/gofmt_common.go index f8d8751f0393..59f4f4590e2c 100644 --- a/pkg/golinters/gofmt_common.go +++ b/pkg/golinters/gofmt_common.go @@ -242,7 +242,7 @@ func extractIssuesFromPatch(patch string, lintCtx *linter.Context, linterName st } if len(diffs) == 0 { - return nil, fmt.Errorf("got no diffs from patch parser: %v", diffs) + return nil, fmt.Errorf("got no diffs from patch parser: %v", patch) } var issues []result.Issue diff --git a/pkg/lint/load.go b/pkg/lint/load.go index 0bac10623e96..c4e1e17659c1 100644 --- a/pkg/lint/load.go +++ b/pkg/lint/load.go @@ -160,7 +160,17 @@ func (cl *ContextLoader) debugPrintLoadedPackages(pkgs []*packages.Package) { func (cl *ContextLoader) parseLoadedPackagesErrors(pkgs []*packages.Package) error { for _, pkg := range pkgs { + var errs []packages.Error for _, err := range pkg.Errors { + // quick fix: skip error related to `go list` invocation by packages.Load() + // The behavior has been changed between go1.19 and go1.20, the error is now inside the JSON content. + // https://github.com/golangci/golangci-lint/pull/3414#issuecomment-1364756303 + if strings.Contains(err.Msg, "# command-line-arguments") { + continue + } + + errs = append(errs, err) + if strings.Contains(err.Msg, "no Go files") { return errors.Wrapf(exitcodes.ErrNoGoFiles, "package %s", pkg.PkgPath) } @@ -169,6 +179,8 @@ func (cl *ContextLoader) parseLoadedPackagesErrors(pkgs []*packages.Package) err return errors.Wrap(exitcodes.ErrFailure, err.Msg) } } + + pkg.Errors = errs } return nil diff --git a/pkg/lint/runner.go b/pkg/lint/runner.go index b21635f0b678..aed317d4c0d6 100644 --- a/pkg/lint/runner.go +++ b/pkg/lint/runner.go @@ -208,6 +208,7 @@ func (r Runner) Run(ctx context.Context, linters []*linter.Config, lintCtx *lint return } + issues = append(issues, linterIssues...) }) } diff --git a/test/testdata/notcompiles/typecheck_many_issues.go b/test/testdata/notcompiles/typecheck_many_issues.go index b103d65ebbc6..654e48d04b5c 100644 --- a/test/testdata/notcompiles/typecheck_many_issues.go +++ b/test/testdata/notcompiles/typecheck_many_issues.go @@ -2,8 +2,8 @@ package testdata func TypeCheckBadCalls() { - typecheckNotExists1.F1() // want "undeclared name: `typecheckNotExists1`" - typecheckNotExists2.F2() // want "undeclared name: `typecheckNotExists2`" - typecheckNotExists3.F3() // want "undeclared name: `typecheckNotExists3`" - typecheckNotExists4.F4() // want "undeclared name: `typecheckNotExists4`" + typecheckNotExists1.F1() // want "undefined: typecheckNotExists1" + typecheckNotExists2.F2() // want "undefined: typecheckNotExists2" + typecheckNotExists3.F3() // want "undefined: typecheckNotExists3" + typecheckNotExists4.F4() // want "undefined: typecheckNotExists4" } From 5afb30ed542f37b8099d2ec4c5aeefdb2835e7d4 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Mon, 26 Dec 2022 01:41:33 +0100 Subject: [PATCH 04/11] fix: use go1.19 for the tests of the previous version of golangci-lint --- .github/workflows/pr.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 0248e3b83169..cf67d3279a14 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -41,7 +41,9 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: ${{ env.GO_VERSION }} + # TODO(ldez) must be changed after the first release of golangci-lint with go1.20 + # go-version: ${{ env.GO_VERSION }} + go-version: 1.19 - name: lint uses: golangci/golangci-lint-action@v3.4.0 with: From 51d2ba01f8939ae2a1e741d4ce2a9014002cfd4d Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Mon, 26 Dec 2022 02:07:05 +0100 Subject: [PATCH 05/11] fix: workflows --- .github/workflows/post-release.yml | 2 +- .github/workflows/pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml index 4fa9c083b681..86e0b58e61fa 100644 --- a/.github/workflows/post-release.yml +++ b/.github/workflows/post-release.yml @@ -18,7 +18,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.18.0-rc.1 + go-version: 1.20.0-rc.1 - name: Update GitHub action config run: make assets/github-action-config.json diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index cf67d3279a14..dc1a69de957b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -90,7 +90,7 @@ jobs: strategy: matrix: golang: - - 1.18 + - 1.19 - 1.20.0-rc.1 steps: - uses: actions/checkout@v3 From 90a41e4a641d3316c5fe9d12579f1b6ef107e48a Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Mon, 26 Dec 2022 02:20:09 +0100 Subject: [PATCH 06/11] fix: skip some typecheck tests because error message changes --- test/testdata/notcompiles/typecheck_many_issues.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/testdata/notcompiles/typecheck_many_issues.go b/test/testdata/notcompiles/typecheck_many_issues.go index 654e48d04b5c..bc0d427cf012 100644 --- a/test/testdata/notcompiles/typecheck_many_issues.go +++ b/test/testdata/notcompiles/typecheck_many_issues.go @@ -1,3 +1,5 @@ +//go:build go1.20 + //golangcitest:args -Etypecheck package testdata From 583e226e94c61af1d954255aa5efc469a411acb4 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Tue, 10 Jan 2023 04:04:25 +0100 Subject: [PATCH 07/11] go1.20-rc2 --- .github/workflows/post-release.yml | 2 +- .github/workflows/pr-extra.yml | 2 +- .github/workflows/pr.yml | 4 ++-- .github/workflows/tag.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml index 86e0b58e61fa..c03635f3da59 100644 --- a/.github/workflows/post-release.yml +++ b/.github/workflows/post-release.yml @@ -18,7 +18,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20.0-rc.1 + go-version: 1.20.0-rc.2 - name: Update GitHub action config run: make assets/github-action-config.json diff --git a/.github/workflows/pr-extra.yml b/.github/workflows/pr-extra.yml index da4024b937d0..ffd3b1a7995f 100644 --- a/.github/workflows/pr-extra.yml +++ b/.github/workflows/pr-extra.yml @@ -17,7 +17,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20.0-rc.1 + go-version: 1.20.0-rc.2 - name: Run go list run: go list -json -m all > go.list - name: Nancy diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index dc1a69de957b..f55976604b90 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,7 +6,7 @@ on: pull_request: env: - GO_VERSION: 1.20.0-rc.1 + GO_VERSION: 1.20.0-rc.2 jobs: # Check if there is any dirty change for go mod tidy @@ -91,7 +91,7 @@ jobs: matrix: golang: - 1.19 - - 1.20.0-rc.1 + - 1.20.0-rc.2 steps: - uses: actions/checkout@v3 - name: Install Go diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 6742097aee9b..f678164c3918 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -18,7 +18,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20.0-rc.1 + go-version: 1.20.0-rc.2 - name: Unshallow run: git fetch --prune --unshallow @@ -48,7 +48,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20.0-rc.1 + go-version: 1.20.0-rc.2 - name: Unshallow run: git fetch --prune --unshallow From 7b17a61fb5df1139af9bbf5e3e69de186ace3272 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Thu, 12 Jan 2023 18:23:18 +0100 Subject: [PATCH 08/11] go1.20-rc3 --- .github/workflows/post-release.yml | 2 +- .github/workflows/pr-extra.yml | 2 +- .github/workflows/pr.yml | 4 ++-- .github/workflows/tag.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml index c03635f3da59..f0bf16cfd588 100644 --- a/.github/workflows/post-release.yml +++ b/.github/workflows/post-release.yml @@ -18,7 +18,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20.0-rc.2 + go-version: 1.20.0-rc.3 - name: Update GitHub action config run: make assets/github-action-config.json diff --git a/.github/workflows/pr-extra.yml b/.github/workflows/pr-extra.yml index ffd3b1a7995f..f5c23a116a3c 100644 --- a/.github/workflows/pr-extra.yml +++ b/.github/workflows/pr-extra.yml @@ -17,7 +17,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20.0-rc.2 + go-version: 1.20.0-rc.3 - name: Run go list run: go list -json -m all > go.list - name: Nancy diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f55976604b90..5667ab7bb114 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,7 +6,7 @@ on: pull_request: env: - GO_VERSION: 1.20.0-rc.2 + GO_VERSION: 1.20.0-rc.3 jobs: # Check if there is any dirty change for go mod tidy @@ -91,7 +91,7 @@ jobs: matrix: golang: - 1.19 - - 1.20.0-rc.2 + - 1.20.0-rc.3 steps: - uses: actions/checkout@v3 - name: Install Go diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index f678164c3918..f3c14c2ab6ec 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -18,7 +18,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20.0-rc.2 + go-version: 1.20.0-rc.3 - name: Unshallow run: git fetch --prune --unshallow @@ -48,7 +48,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20.0-rc.2 + go-version: 1.20.0-rc.3 - name: Unshallow run: git fetch --prune --unshallow From 0d5b425bdcabc74da5717270308cdd5ea49024af Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Fri, 13 Jan 2023 09:37:44 +0100 Subject: [PATCH 09/11] doc: remove wrong URL --- pkg/lint/lintersdb/manager.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/lint/lintersdb/manager.go b/pkg/lint/lintersdb/manager.go index 3bfbbdc26943..10e27f6d6227 100644 --- a/pkg/lint/lintersdb/manager.go +++ b/pkg/lint/lintersdb/manager.go @@ -453,8 +453,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config { linter.NewConfig(golinters.NewGochecknoinits()). WithSince("v1.12.0"). - WithPresets(linter.PresetStyle). - WithURL("https://github.com/leighmcculloch/gochecknoinits"), + WithPresets(linter.PresetStyle), linter.NewConfig(golinters.NewGocognit(gocognitCfg)). WithSince("v1.20.0"). From fba6ca32d979d7ecd35efc9528ccdabb3a1324ba Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Wed, 1 Feb 2023 20:56:43 +0100 Subject: [PATCH 10/11] feat: go1.20 --- .github/workflows/post-release.yml | 2 +- .github/workflows/pr-extra.yml | 2 +- .github/workflows/pr.yml | 4 ++-- .github/workflows/tag.yml | 4 ++-- build/Dockerfile | 4 ++-- build/alpine.Dockerfile | 4 ++-- go.mod | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml index f0bf16cfd588..18bbf6a142cc 100644 --- a/.github/workflows/post-release.yml +++ b/.github/workflows/post-release.yml @@ -18,7 +18,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20.0-rc.3 + go-version: 1.20 - name: Update GitHub action config run: make assets/github-action-config.json diff --git a/.github/workflows/pr-extra.yml b/.github/workflows/pr-extra.yml index f5c23a116a3c..ae5adae46082 100644 --- a/.github/workflows/pr-extra.yml +++ b/.github/workflows/pr-extra.yml @@ -17,7 +17,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20.0-rc.3 + go-version: 1.20 - name: Run go list run: go list -json -m all > go.list - name: Nancy diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 5667ab7bb114..84e88184605e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,7 +6,7 @@ on: pull_request: env: - GO_VERSION: 1.20.0-rc.3 + GO_VERSION: 1.20 jobs: # Check if there is any dirty change for go mod tidy @@ -91,7 +91,7 @@ jobs: matrix: golang: - 1.19 - - 1.20.0-rc.3 + - 1.20 steps: - uses: actions/checkout@v3 - name: Install Go diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index f3c14c2ab6ec..d1e96d4305e6 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -18,7 +18,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20.0-rc.3 + go-version: 1.20 - name: Unshallow run: git fetch --prune --unshallow @@ -48,7 +48,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20.0-rc.3 + go-version: 1.20 - name: Unshallow run: git fetch --prune --unshallow diff --git a/build/Dockerfile b/build/Dockerfile index b3839a4eb1c8..3488446b7c71 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,5 +1,5 @@ # stage 1 building the code -FROM golang:1.19 as builder +FROM golang:1.20 as builder ARG VERSION ARG SHORT_COMMIT @@ -10,7 +10,7 @@ WORKDIR /golangci RUN CGO_ENABLED=0 go build -trimpath -ldflags "-s -w -X main.version=$VERSION -X main.commit=$SHORT_COMMIT -X main.date=$DATE" -o golangci-lint ./cmd/golangci-lint/main.go # stage 2 -FROM golang:1.19 +FROM golang:1.20 # related to https://github.com/golangci/golangci-lint/issues/3107 ENV GOROOT /usr/local/go # don't place it into $GOPATH/bin because Drone mounts $GOPATH as volume diff --git a/build/alpine.Dockerfile b/build/alpine.Dockerfile index c19449fbc197..5eeb76228de2 100644 --- a/build/alpine.Dockerfile +++ b/build/alpine.Dockerfile @@ -1,5 +1,5 @@ # stage 1 building the code -FROM golang:1.19-alpine as builder +FROM golang:1.20-alpine as builder ARG VERSION ARG SHORT_COMMIT @@ -15,7 +15,7 @@ RUN apk --no-cache add gcc musl-dev git mercurial RUN CGO_ENABLED=0 go build -trimpath -ldflags "-s -w -X main.version=$VERSION -X main.commit=$SHORT_COMMIT -X main.date=$DATE" -o golangci-lint ./cmd/golangci-lint/main.go # stage 2 -FROM golang:1.19-alpine +FROM golang:1.20-alpine # related to https://github.com/golangci/golangci-lint/issues/3107 ENV GOROOT /usr/local/go # gcc is required to support cgo; diff --git a/go.mod b/go.mod index fcf9030d77e1..4aab515297eb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/golangci/golangci-lint -go 1.20 +go 1.19 require ( 4d63.com/gocheckcompilerdirectives v1.2.1 From b4d9aee3ed1b6861474519ce2db93e793be5fb3b Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Thu, 2 Feb 2023 03:06:11 +0100 Subject: [PATCH 11/11] try to use quote --- .github/workflows/post-release.yml | 2 +- .github/workflows/pr-extra.yml | 2 +- .github/workflows/pr.yml | 4 ++-- .github/workflows/tag.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml index 18bbf6a142cc..1da84e0cd31a 100644 --- a/.github/workflows/post-release.yml +++ b/.github/workflows/post-release.yml @@ -18,7 +18,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20 + go-version: '1.20' - name: Update GitHub action config run: make assets/github-action-config.json diff --git a/.github/workflows/pr-extra.yml b/.github/workflows/pr-extra.yml index ae5adae46082..221e4aa82f70 100644 --- a/.github/workflows/pr-extra.yml +++ b/.github/workflows/pr-extra.yml @@ -17,7 +17,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20 + go-version: '1.20' - name: Run go list run: go list -json -m all > go.list - name: Nancy diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 84e88184605e..816cbd264abf 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -6,7 +6,7 @@ on: pull_request: env: - GO_VERSION: 1.20 + GO_VERSION: '1.20' jobs: # Check if there is any dirty change for go mod tidy @@ -91,7 +91,7 @@ jobs: matrix: golang: - 1.19 - - 1.20 + - '1.20' steps: - uses: actions/checkout@v3 - name: Install Go diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index d1e96d4305e6..0fa56a310c88 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -18,7 +18,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20 + go-version: '1.20' - name: Unshallow run: git fetch --prune --unshallow @@ -48,7 +48,7 @@ jobs: # ex: # - 1.18beta1 -> 1.18.0-beta.1 # - 1.18rc1 -> 1.18.0-rc.1 - go-version: 1.20 + go-version: '1.20' - name: Unshallow run: git fetch --prune --unshallow