From 5564c39105ba38ab74371d04f8b214afc6229cca Mon Sep 17 00:00:00 2001
From: TheFox0x7 <thefox0x7@gmail.com>
Date: Sat, 29 Mar 2025 15:01:06 +0100
Subject: [PATCH] update to golangci-lint v2 (#34054)
updates config to v2.
config was generated with migrate command.
disable all newly exposed issues because there are too many.
---
.golangci.yml | 281 ++++++++++++++++++++++++++++----------------------
Makefile | 2 +-
2 files changed, 156 insertions(+), 127 deletions(-)
diff --git a/.golangci.yml b/.golangci.yml
index cf7a6f1a1f..cd0a21d0ca 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,7 +1,9 @@
+version: "2"
+output:
+ sort-order:
+ - file
linters:
- enable-all: false
- disable-all: true
- fast: false
+ default: none
enable:
- bidichk
- depguard
@@ -9,141 +11,168 @@ linters:
- errcheck
- forbidigo
- gocritic
- - gofmt
- - gofumpt
- - gosimple
- govet
- ineffassign
- nakedret
- nolintlint
- revive
- staticcheck
- - stylecheck
- testifylint
- - typecheck
- unconvert
- - unused
- unparam
+ - unused
- usetesting
- wastedassign
-
-run:
- timeout: 10m
-
-output:
- sort-results: true
- sort-order: [file]
- show-stats: true
-
-linters-settings:
- testifylint:
- disable:
- - go-require
- - require-error
- stylecheck:
- checks: ["all", "-ST1005", "-ST1003"]
- nakedret:
- max-func-lines: 0
- gocritic:
- disabled-checks:
- - ifElseChain
- - singleCaseSwitch # Every time this occurred in the code, there was no other way.
- revive:
- severity: error
+ settings:
+ depguard:
+ rules:
+ main:
+ deny:
+ - pkg: encoding/json
+ desc: use gitea's modules/json instead of encoding/json
+ - pkg: github.com/unknwon/com
+ desc: use gitea's util and replacements
+ - pkg: io/ioutil
+ desc: use os or io instead
+ - pkg: golang.org/x/exp
+ desc: it's experimental and unreliable
+ - pkg: code.gitea.io/gitea/modules/git/internal
+ desc: do not use the internal package, use AddXxx function instead
+ - pkg: gopkg.in/ini.v1
+ desc: do not use the ini package, use gitea's config system instead
+ - pkg: gitea.com/go-chi/cache
+ desc: do not use the go-chi cache package, use gitea's cache system
+ gocritic:
+ disabled-checks:
+ - ifElseChain
+ - singleCaseSwitch # Every time this occurred in the code, there was no other way.
+ revive:
+ severity: error
+ rules:
+ - name: atomic
+ - name: bare-return
+ - name: blank-imports
+ - name: constant-logical-expr
+ - name: context-as-argument
+ - name: context-keys-type
+ - name: dot-imports
+ - name: duplicated-imports
+ - name: empty-lines
+ - name: error-naming
+ - name: error-return
+ - name: error-strings
+ - name: errorf
+ - name: exported
+ - name: identical-branches
+ - name: if-return
+ - name: increment-decrement
+ - name: indent-error-flow
+ - name: modifies-value-receiver
+ - name: package-comments
+ - name: range
+ - name: receiver-naming
+ - name: redefines-builtin-id
+ - name: string-of-int
+ - name: superfluous-else
+ - name: time-naming
+ - name: unconditional-recursion
+ - name: unexported-return
+ - name: unreachable-code
+ - name: var-declaration
+ - name: var-naming
+ staticcheck:
+ checks:
+ - all
+ - -ST1003
+ - -ST1005
+ - -QF1001
+ - -QF1002
+ - -QF1003
+ - -QF1006
+ - -QF1007
+ - -QF1008
+ - -QF1009
+ - -QF1012
+ testifylint:
+ disable:
+ - go-require
+ - require-error
+ - equal-values
+ - empty
+ - formatter
+ - len
+ usetesting:
+ os-temp-dir: true
+ exclusions:
+ generated: lax
+ presets:
+ - comments
+ - common-false-positives
+ - legacy
+ - std-error-handling
rules:
- - name: atomic
- - name: bare-return
- - name: blank-imports
- - name: constant-logical-expr
- - name: context-as-argument
- - name: context-keys-type
- - name: dot-imports
- - name: duplicated-imports
- - name: empty-lines
- - name: error-naming
- - name: error-return
- - name: error-strings
- - name: errorf
- - name: exported
- - name: identical-branches
- - name: if-return
- - name: increment-decrement
- - name: indent-error-flow
- - name: modifies-value-receiver
- - name: package-comments
- - name: range
- - name: receiver-naming
- - name: redefines-builtin-id
- - name: string-of-int
- - name: superfluous-else
- - name: time-naming
- - name: unconditional-recursion
- - name: unexported-return
- - name: unreachable-code
- - name: var-declaration
- - name: var-naming
- gofumpt:
- extra-rules: true
- depguard:
- rules:
- main:
- deny:
- - pkg: encoding/json
- desc: use gitea's modules/json instead of encoding/json
- - pkg: github.com/unknwon/com
- desc: use gitea's util and replacements
- - pkg: io/ioutil
- desc: use os or io instead
- - pkg: golang.org/x/exp
- desc: it's experimental and unreliable
- - pkg: code.gitea.io/gitea/modules/git/internal
- desc: do not use the internal package, use AddXxx function instead
- - pkg: gopkg.in/ini.v1
- desc: do not use the ini package, use gitea's config system instead
- - pkg: gitea.com/go-chi/cache
- desc: do not use the go-chi cache package, use gitea's cache system
- usetesting:
- os-temp-dir: true
-
+ - linters:
+ - dupl
+ - errcheck
+ - gocyclo
+ - gosec
+ - staticcheck
+ - unparam
+ path: _test\.go
+ - linters:
+ - dupl
+ - errcheck
+ - gocyclo
+ - gosec
+ path: models/migrations/v
+ - linters:
+ - forbidigo
+ path: cmd
+ - linters:
+ - dupl
+ text: (?i)webhook
+ - linters:
+ - gocritic
+ text: (?i)`ID' should not be capitalized
+ - linters:
+ - deadcode
+ - unused
+ text: (?i)swagger
+ - linters:
+ - staticcheck
+ text: (?i)argument x is overwritten before first use
+ - linters:
+ - gocritic
+ text: '(?i)commentFormatting: put a space between `//` and comment text'
+ - linters:
+ - gocritic
+ text: '(?i)exitAfterDefer:'
+ paths:
+ - node_modules
+ - public
+ - web_src
+ - third_party$
+ - builtin$
+ - examples$
issues:
max-issues-per-linter: 0
max-same-issues: 0
- exclude-dirs: [node_modules, public, web_src]
- exclude-case-sensitive: true
- exclude-rules:
- - path: _test\.go
- linters:
- - gocyclo
- - errcheck
- - dupl
- - gosec
- - unparam
- - staticcheck
- - path: models/migrations/v
- linters:
- - gocyclo
- - errcheck
- - dupl
- - gosec
- - path: cmd
- linters:
- - forbidigo
- - text: "webhook"
- linters:
- - dupl
- - text: "`ID' should not be capitalized"
- linters:
- - gocritic
- - text: "swagger"
- linters:
- - unused
- - deadcode
- - text: "argument x is overwritten before first use"
- linters:
- - staticcheck
- - text: "commentFormatting: put a space between `//` and comment text"
- linters:
- - gocritic
- - text: "exitAfterDefer:"
- linters:
- - gocritic
+formatters:
+ enable:
+ - gofmt
+ - gofumpt
+ settings:
+ gofumpt:
+ extra-rules: true
+ exclusions:
+ generated: lax
+ paths:
+ - node_modules
+ - public
+ - web_src
+ - third_party$
+ - builtin$
+ - examples$
+
+run:
+ timeout: 10m
diff --git a/Makefile b/Makefile
index aefd38bba5..685cbf6589 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ XGO_VERSION := go-1.24.x
AIR_PACKAGE ?= github.com/air-verse/air@v1
EDITORCONFIG_CHECKER_PACKAGE ?= github.com/editorconfig-checker/editorconfig-checker/v3/cmd/editorconfig-checker@v3.2.1
GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.7.0
-GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.7
+GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.0.2
GXZ_PACKAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.12
MISSPELL_PACKAGE ?= github.com/golangci/misspell/cmd/misspell@v0.6.0
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.31.0