Skip to content

Commit 0585ac3

Browse files
silverwindsilverwind
authored
Update go dev dependencies (#22064)
`golangci-lint` [deprecated](golangci/golangci-lint#1841) a bunch of linters, removed them.
1 parent cf27403 commit 0585ac3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+71
-67
lines changed

‎.golangci.yml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
linters:
22
enable:
3-
- gosimple
4-
- deadcode
5-
- typecheck
6-
- govet
7-
- errcheck
8-
- staticcheck
9-
- unused
10-
- structcheck
11-
- varcheck
3+
- bidichk
4+
# - deadcode # deprecated - https://github.com/golangci/golangci-lint/issues/1841
5+
- depguard
126
- dupl
13-
#- gocyclo # The cyclomatic complexety of a lot of functions is too high, we should refactor those another time.
14-
- gofmt
7+
- errcheck
158
- gocritic
16-
- bidichk
17-
- ineffassign
18-
- revive
9+
# - gocyclo # The cyclomatic complexety of a lot of functions is too high, we should refactor those another time.
10+
- gofmt
1911
- gofumpt
20-
- depguard
12+
- gosimple
13+
- govet
14+
- ineffassign
2115
- nakedret
22-
- unconvert
23-
- wastedassign
2416
- nolintlint
17+
- revive
18+
- staticcheck
19+
# - structcheck # deprecated - https://github.com/golangci/golangci-lint/issues/1841
2520
- stylecheck
21+
- typecheck
22+
- unconvert
23+
- unused
24+
# - varcheck # deprecated - https://github.com/golangci/golangci-lint/issues/1841
25+
# - wastedassign # disabled - https://github.com/golangci/golangci-lint/issues/2649
2626
enable-all: false
2727
disable-all: true
2828
fast: false

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ COMMA := ,
2626
XGO_VERSION := go-1.19.x
2727

2828
AIR_PACKAGE ?= github.com/cosmtrek/[email protected]
29-
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.5.0
30-
ERRCHECK_PACKAGE ?= github.com/kisielk/[email protected].1
31-
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.3.1
32-
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.47.0
29+
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/cmd/editorconfig-checker@2.6.0
30+
ERRCHECK_PACKAGE ?= github.com/kisielk/[email protected].2
31+
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.4.0
32+
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50.1
3333
GXZ_PAGAGE ?= github.com/ulikunitz/xz/cmd/[email protected]
3434
MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/[email protected]
35-
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/[email protected].0
35+
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/[email protected].3
3636
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
37-
GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1.3.0
37+
GO_LICENSES_PACKAGE ?= github.com/google/go-licenses@v1.5.0
3838
GOVULNCHECK_PACKAGE ?= golang.org/x/vuln/cmd/govulncheck@latest
3939

4040
DOCKER_IMAGE ?= gitea/gitea

‎models/db/context.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@ type contextKey struct {
2121
}
2222

2323
// enginedContextKey is a context key. It is used with context.Value() to get the current Engined for the context
24-
var enginedContextKey = &contextKey{"engined"}
25-
var _ Engined = &Context{}
24+
var (
25+
enginedContextKey = &contextKey{"engined"}
26+
_ Engined = &Context{}
27+
)
2628

2729
// Context represents a db context
2830
type Context struct {

‎models/migrations/v1_17/main_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2021 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package v1_17 // nolint
4+
package v1_17 //nolint
55

66
import (
77
"testing"

‎models/migrations/v1_17/v211.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2022 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package v1_17 // nolint
4+
package v1_17 //nolint
55

66
import (
77
"fmt"

‎models/migrations/v1_17/v212.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2022 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package v1_17 // nolint
4+
package v1_17 //nolint
55

66
import (
77
"code.gitea.io/gitea/modules/timeutil"

‎models/migrations/v1_17/v213.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2022 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package v1_17 // nolint
4+
package v1_17 //nolint
55

66
import (
77
"xorm.io/xorm"

‎models/migrations/v1_17/v214.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2022 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package v1_17 // nolint
4+
package v1_17 //nolint
55

66
import (
77
"xorm.io/xorm"

‎models/migrations/v1_17/v215.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2022 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package v1_17 // nolint
4+
package v1_17 //nolint
55

66
import (
77
"code.gitea.io/gitea/models/pull"

‎models/migrations/v1_17/v216.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright 2022 The Gitea Authors. All rights reserved.
22
// SPDX-License-Identifier: MIT
33

4-
package v1_17 // nolint
4+
package v1_17 //nolint
55

66
// This migration added non-ideal indices to the action table which on larger datasets slowed things down
77
// it has been superceded by v218.go

0 commit comments

Comments
 (0)