Add interface{} to any replacement to make fmt, exclude *.pb.go

Makefile

@@ -295,7 +295,7 @@ clean:
 
 .PHONY: fmt
 fmt:
- GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
+ @GOFUMPT_PACKAGE=$(GOFUMPT_PACKAGE) $(GO) run build/code-batch-process.go gitea-fmt -w '{file-list}'
  $(eval TEMPLATES := $(shell find templates -type f -name '*.tmpl'))
  @# strip whitespace after '{{' or '(' and before '}}' or ')' unless there is only
  @# whitespace before it

build/code-batch-process.go

@@ -203,17 +203,6 @@ Example:
 `, "file-batch-exec")
 }
 
-func getGoVersion() string {
- goModFile, err := os.ReadFile("go.mod")
- if err != nil {
- log.Fatalf(`Faild to read "go.mod": %v`, err)
- os.Exit(1)
- }
- goModVersionRegex := regexp.MustCompile(`go \d+\.\d+`)
- goModVersionLine := goModVersionRegex.Find(goModFile)
- return string(goModVersionLine[3:])
-}
-
 func newFileCollectorFromMainOptions(mainOptions map[string]string) (fc *fileCollector, err error) {
  fileFilter := mainOptions["file-filter"]
  if fileFilter == "" {
@@ -278,7 +267,8 @@ func main() {
  log.Print("the -d option is not supported by gitea-fmt")
  }
  cmdErrors = append(cmdErrors, giteaFormatGoImports(files, containsString(subArgs, "-w")))
- cmdErrors = append(cmdErrors, passThroughCmd("go", append([]string{"run", os.Getenv("GOFUMPT_PACKAGE"), "-extra", "-lang", getGoVersion()}, substArgs...)))
+ cmdErrors = append(cmdErrors, passThroughCmd("gofmt", append([]string{"-w", "-r", "interface{} -> any"}, substArgs...)))
+ cmdErrors = append(cmdErrors, passThroughCmd("go", append([]string{"run", os.Getenv("GOFUMPT_PACKAGE"), "-extra"}, substArgs...)))
  default:
  log.Fatalf("unknown cmd: %s %v", subCmd, subArgs)
  }

modules/optional/serialization.go

@@ -35,7 +35,7 @@ func (o *Option[T]) UnmarshalYAML(value *yaml.Node) error {
  return nil
 }
 
-func (o Option[T]) MarshalYAML() (interface{}, error) {
+func (o Option[T]) MarshalYAML() (any, error) {
  if !o.Has() {
  return nil, nil
  }

services/actions/auth_test.go

@@ -20,7 +20,7 @@ func TestCreateAuthorizationToken(t *testing.T) {
  assert.Nil(t, err)
  assert.NotEqual(t, "", token)
  claims := jwt.MapClaims{}
- _, err = jwt.ParseWithClaims(token, claims, func(t *jwt.Token) (interface{}, error) {
+ _, err = jwt.ParseWithClaims(token, claims, func(t *jwt.Token) (any, error) {
  return setting.GetGeneralTokenSigningSecret(), nil
  })
  assert.Nil(t, err)