Replace custom Go formatter with golangci-lint fmt (#37194)

Use `golangci-lint fmt` to format code, replacing the previous custom
formatter tool. https://github.com/daixiang0/gci is used to order the
imports.

`make fmt` performs ~13% faster while consuming ~57% less cpu while
formatting for me.

`GOFUMPT_PACKAGE` is gone because it's using the builtin package from
golangci-lint.

Co-authored-by: Claude (claude-opus-4-6) <noreply@anthropic.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
silverwind
2026-04-17 19:45:22 +02:00
committed by GitHub
parent 279bf84066
commit a9108ab6aa
23 changed files with 82 additions and 664 deletions

View File

@@ -11,11 +11,11 @@ import (
"reflect"
"strings"
"xorm.io/xorm"
_ "github.com/go-sql-driver/mysql" // Needed for the MySQL driver
_ "github.com/lib/pq" // Needed for the Postgresql driver
_ "github.com/microsoft/go-mssqldb" // Needed for the MSSQL driver
"xorm.io/xorm"
)
var (

View File

@@ -9,7 +9,6 @@ import (
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/secret"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
"xorm.io/builder"
"xorm.io/xorm"
@@ -129,11 +128,11 @@ func AddHeaderAuthorizationEncryptedColWebhook(x *xorm.Engine) error {
}
type MatrixPayloadSafe struct {
Body string `json:"body"`
MsgType string `json:"msgtype"`
Format string `json:"format"`
FormattedBody string `json:"formatted_body"`
Commits []*api.PayloadCommit `json:"io.gitea.commits,omitempty"`
Body string `json:"body"`
MsgType string `json:"msgtype"`
Format string `json:"format"`
FormattedBody string `json:"formatted_body"`
Commits json.Value `json:"io.gitea.commits,omitempty"`
}
type MatrixPayloadUnsafe struct {
MatrixPayloadSafe

View File

@@ -13,7 +13,6 @@ import (
"code.gitea.io/gitea/modules/json"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"
webhook_module "code.gitea.io/gitea/modules/webhook"
"xorm.io/xorm"
@@ -59,6 +58,29 @@ type migrationCommitStatus struct {
TargetURL string
}
// Frozen subsets of modules/structs payload types, decoded from stored
// action_run.event_payload values. Inlined so the migration is insulated
// from future field changes in modules/structs.
type migrationPayloadCommit struct {
ID string `json:"id"`
}
type migrationPushPayload struct {
HeadCommit *migrationPayloadCommit `json:"head_commit"`
}
type migrationPRBranchInfo struct {
Sha string `json:"sha"`
}
type migrationPullRequest struct {
Head *migrationPRBranchInfo `json:"head"`
}
type migrationPullRequestPayload struct {
PullRequest *migrationPullRequest `json:"pull_request"`
}
type commitSHAAndRuns struct {
commitSHA string
runs map[int64]*migrationActionRun
@@ -292,22 +314,22 @@ func getCommitStatusCommitID(run *migrationActionRun) (string, error) {
}
}
func getPushEventPayload(run *migrationActionRun) (*api.PushPayload, error) {
func getPushEventPayload(run *migrationActionRun) (*migrationPushPayload, error) {
if run.Event != webhook_module.HookEventPush {
return nil, fmt.Errorf("event %s is not a push event", run.Event)
}
var payload api.PushPayload
var payload migrationPushPayload
if err := json.Unmarshal([]byte(run.EventPayload), &payload); err != nil {
return nil, err
}
return &payload, nil
}
func getPullRequestEventPayload(run *migrationActionRun) (*api.PullRequestPayload, error) {
func getPullRequestEventPayload(run *migrationActionRun) (*migrationPullRequestPayload, error) {
if !run.Event.IsPullRequest() && !run.Event.IsPullRequestReview() {
return nil, fmt.Errorf("event %s is not a pull request event", run.Event)
}
var payload api.PullRequestPayload
var payload migrationPullRequestPayload
if err := json.Unmarshal([]byte(run.EventPayload), &payload); err != nil {
return nil, err
}

View File

@@ -9,8 +9,6 @@ import (
"strconv"
"strings"
_ "image/jpeg" // Needed for jpeg support
"code.gitea.io/gitea/models/db"
issues_model "code.gitea.io/gitea/models/issues"
repo_model "code.gitea.io/gitea/models/repo"
@@ -18,6 +16,8 @@ import (
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/log"
_ "image/jpeg" // Needed for jpeg support
"xorm.io/builder"
)

View File

@@ -20,8 +20,6 @@ import (
"time"
"unicode"
_ "image/jpeg" // Needed for jpeg support
"code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/auth/openid"
@@ -39,6 +37,8 @@ import (
"code.gitea.io/gitea/modules/util"
"code.gitea.io/gitea/modules/validation"
_ "image/jpeg" // Needed for jpeg support
"golang.org/x/text/runes"
"golang.org/x/text/transform"
"golang.org/x/text/unicode/norm"