Skip to content

Commit 20c135c

Browse files
authored
Use Go 1.19 fmt for Gitea 1.17, sync emoji data (#21239)
The images used by Gitea's drone pipeline were upgraded to Go 1.19.x It causes the lint fails because Go 1.19 uses new code format. This PR partially backport #20758 (including the emoji-data sync), partially fix the format manually.
1 parent 937ef6f commit 20c135c

File tree

25 files changed

+629
-581
lines changed

25 files changed

+629
-581
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ GOFUMPT_PACKAGE ?= mvdan.cc/[email protected]
3333
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/[email protected]
3434
GXZ_PAGAGE ?= github.com/ulikunitz/xz/cmd/[email protected]
3535
MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/[email protected]
36-
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.29.0
36+
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.30.0
3737
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
3838

3939
DOCKER_IMAGE ?= gitea/gitea

assets/emoji.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

build/generate-emoji.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,7 @@ const hdr = `
214214
215215
package emoji
216216
217-
// Code generated by gen.go. DO NOT EDIT.
217+
// Code generated by build/generate-emoji.go. DO NOT EDIT.
218218
// Sourced from %s
219-
//
220219
var GemojiData = %#v
221220
`

0 commit comments

Comments
 (0)