mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	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.
This commit is contained in:
		
							
								
								
									
										2
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								Makefile
									
									
									
									
									
								
							@@ -33,7 +33,7 @@ GOFUMPT_PACKAGE ?= mvdan.cc/gofumpt@v0.3.1
 | 
			
		||||
GOLANGCI_LINT_PACKAGE ?= github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.0
 | 
			
		||||
GXZ_PAGAGE ?= github.com/ulikunitz/xz/cmd/gxz@v0.5.10
 | 
			
		||||
MISSPELL_PACKAGE ?= github.com/client9/misspell/cmd/misspell@v0.3.4
 | 
			
		||||
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.29.0
 | 
			
		||||
SWAGGER_PACKAGE ?= github.com/go-swagger/go-swagger/cmd/swagger@v0.30.0
 | 
			
		||||
XGO_PACKAGE ?= src.techknowlogick.com/xgo@latest
 | 
			
		||||
 | 
			
		||||
DOCKER_IMAGE ?= gitea/gitea
 | 
			
		||||
 
 | 
			
		||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							@@ -214,8 +214,7 @@ const hdr = `
 | 
			
		||||
 | 
			
		||||
package emoji
 | 
			
		||||
 | 
			
		||||
// Code generated by gen.go. DO NOT EDIT.
 | 
			
		||||
// Code generated by build/generate-emoji.go. DO NOT EDIT.
 | 
			
		||||
// Sourced from %s
 | 
			
		||||
//
 | 
			
		||||
var GemojiData = %#v
 | 
			
		||||
`
 | 
			
		||||
 
 | 
			
		||||
@@ -59,6 +59,7 @@ func b1(img *image.Paletted, x, y, size, angle int) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// a small block
 | 
			
		||||
//
 | 
			
		||||
//	----------
 | 
			
		||||
//	|        |
 | 
			
		||||
//	|  ####  |
 | 
			
		||||
 
 | 
			
		||||
@@ -322,7 +322,7 @@ func TestGuessDelimiter(t *testing.T) {
 | 
			
		||||
		},
 | 
			
		||||
		// case 3 - tab delimited
 | 
			
		||||
		{
 | 
			
		||||
			csv: "1	2",
 | 
			
		||||
			csv:               "1\t2",
 | 
			
		||||
			expectedDelimiter: '\t',
 | 
			
		||||
		},
 | 
			
		||||
		// case 4 - pipe delimited
 | 
			
		||||
 
 | 
			
		||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							@@ -69,7 +69,6 @@ func NewParser(r io.Reader, format Format) *Parser {
 | 
			
		||||
// It could, for example return something like:
 | 
			
		||||
//
 | 
			
		||||
//	{ "objecttype": "tag", "refname:short": "v1.16.4", "object": "f460b7543ed500e49c133c2cd85c8c55ee9dbe27" }
 | 
			
		||||
//
 | 
			
		||||
func (p *Parser) Next() map[string]string {
 | 
			
		||||
	if !p.scanner.Scan() {
 | 
			
		||||
		return nil
 | 
			
		||||
@@ -90,7 +89,6 @@ func (p *Parser) Err() error {
 | 
			
		||||
// parseRef parses out all key-value pairs from a single reference block, such as
 | 
			
		||||
//
 | 
			
		||||
//	"objecttype tag\0refname:short v1.16.4\0object f460b7543ed500e49c133c2cd85c8c55ee9dbe27"
 | 
			
		||||
//
 | 
			
		||||
func (p *Parser) parseRef(refBlock string) (map[string]string, error) {
 | 
			
		||||
	if refBlock == "" {
 | 
			
		||||
		// must be at EOF
 | 
			
		||||
 
 | 
			
		||||
@@ -19,8 +19,10 @@ import (
 | 
			
		||||
type Signature = object.Signature
 | 
			
		||||
 | 
			
		||||
// Helper to get a signature from the commit line, which looks like these:
 | 
			
		||||
//
 | 
			
		||||
//	author Patrick Gundlach <gundlach@speedata.de> 1378823654 +0200
 | 
			
		||||
//	author Patrick Gundlach <gundlach@speedata.de> Thu, 07 Apr 2005 22:13:13 +0200
 | 
			
		||||
//
 | 
			
		||||
// but without the "author " at the beginning (this method should)
 | 
			
		||||
// be used for author and committer.
 | 
			
		||||
//
 | 
			
		||||
 
 | 
			
		||||
@@ -37,8 +37,10 @@ func (s *Signature) Decode(b []byte) {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Helper to get a signature from the commit line, which looks like these:
 | 
			
		||||
//
 | 
			
		||||
//	author Patrick Gundlach <gundlach@speedata.de> 1378823654 +0200
 | 
			
		||||
//	author Patrick Gundlach <gundlach@speedata.de> Thu, 07 Apr 2005 22:13:13 +0200
 | 
			
		||||
//
 | 
			
		||||
// but without the "author " at the beginning (this method should)
 | 
			
		||||
// be used for author and committer.
 | 
			
		||||
func newSignatureFromCommitline(line []byte) (sig *Signature, err error) {
 | 
			
		||||
 
 | 
			
		||||
@@ -93,6 +93,7 @@ func NewFileLogger() LoggerProvider {
 | 
			
		||||
 | 
			
		||||
// Init file logger with json config.
 | 
			
		||||
// config like:
 | 
			
		||||
//
 | 
			
		||||
//	{
 | 
			
		||||
//	"filename":"log/gogs.log",
 | 
			
		||||
//	"maxsize":1<<30,
 | 
			
		||||
 
 | 
			
		||||
@@ -48,6 +48,7 @@ func NewSMTPLogger() LoggerProvider {
 | 
			
		||||
 | 
			
		||||
// Init smtp writer with json config.
 | 
			
		||||
// config like:
 | 
			
		||||
//
 | 
			
		||||
//	{
 | 
			
		||||
//		"Username":"example@gmail.com",
 | 
			
		||||
//		"password:"password",
 | 
			
		||||
 
 | 
			
		||||
@@ -25,7 +25,7 @@ func DumpMemProfileForUsername(pprofDataPath, username string) error {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// DumpCPUProfileForUsername dumps a CPU profile at pprofDataPath as cpuprofile_<username>_<temporary id>
 | 
			
		||||
//  it returns the stop function which stops, writes and closes the CPU profile file
 | 
			
		||||
// the stop function it returns stops, writes and closes the CPU profile file
 | 
			
		||||
func DumpCPUProfileForUsername(pprofDataPath, username string) (func(), error) {
 | 
			
		||||
	f, err := os.CreateTemp(pprofDataPath, fmt.Sprintf("cpuprofile_%s_", username))
 | 
			
		||||
	if err != nil {
 | 
			
		||||
 
 | 
			
		||||
@@ -17,13 +17,13 @@ func isSnakeCaseLowerOrNumber(c byte) bool {
 | 
			
		||||
// ToSnakeCase convert the input string to snake_case format.
 | 
			
		||||
//
 | 
			
		||||
// Some samples.
 | 
			
		||||
//
 | 
			
		||||
//	"FirstName"  => "first_name"
 | 
			
		||||
//	"HTTPServer" => "http_server"
 | 
			
		||||
//	"NoHTTPS"    => "no_https"
 | 
			
		||||
//	"GO_PATH"    => "go_path"
 | 
			
		||||
//	"GO PATH"    => "go_path"      // space is converted to underscore.
 | 
			
		||||
//	"GO-PATH"    => "go_path"      // hyphen is converted to underscore.
 | 
			
		||||
//
 | 
			
		||||
func ToSnakeCase(input string) string {
 | 
			
		||||
	if len(input) == 0 {
 | 
			
		||||
		return ""
 | 
			
		||||
 
 | 
			
		||||
@@ -34,7 +34,7 @@ func GetGitAllRefs(ctx *context.APIContext) {
 | 
			
		||||
	//   required: true
 | 
			
		||||
	// responses:
 | 
			
		||||
	//   "200":
 | 
			
		||||
	//     "$ref": "#/responses/Reference"
 | 
			
		||||
	// #   "$ref": "#/responses/Reference" TODO: swagger doesnt support different output formats by ref
 | 
			
		||||
	//     "$ref": "#/responses/ReferenceList"
 | 
			
		||||
	//   "404":
 | 
			
		||||
	//     "$ref": "#/responses/notFound"
 | 
			
		||||
@@ -67,7 +67,7 @@ func GetGitRefs(ctx *context.APIContext) {
 | 
			
		||||
	//   required: true
 | 
			
		||||
	// responses:
 | 
			
		||||
	//   "200":
 | 
			
		||||
	//     "$ref": "#/responses/Reference"
 | 
			
		||||
	// #   "$ref": "#/responses/Reference" TODO: swagger doesnt support different output formats by ref
 | 
			
		||||
	//     "$ref": "#/responses/ReferenceList"
 | 
			
		||||
	//   "404":
 | 
			
		||||
	//     "$ref": "#/responses/notFound"
 | 
			
		||||
 
 | 
			
		||||
@@ -566,6 +566,8 @@ func ListMyTrackedTimes(ctx *context.APIContext) {
 | 
			
		||||
	// swagger:operation GET /user/times user userCurrentTrackedTimes
 | 
			
		||||
	// ---
 | 
			
		||||
	// summary: List the current user's tracked times
 | 
			
		||||
	// produces:
 | 
			
		||||
	// - application/json
 | 
			
		||||
	// parameters:
 | 
			
		||||
	// - name: page
 | 
			
		||||
	//   in: query
 | 
			
		||||
@@ -575,9 +577,6 @@ func ListMyTrackedTimes(ctx *context.APIContext) {
 | 
			
		||||
	//   in: query
 | 
			
		||||
	//   description: page size of results
 | 
			
		||||
	//   type: integer
 | 
			
		||||
	// produces:
 | 
			
		||||
	// - application/json
 | 
			
		||||
	// parameters:
 | 
			
		||||
	// - name: since
 | 
			
		||||
	//   in: query
 | 
			
		||||
	//   description: Only show times updated after the given time. This is a timestamp in RFC 3339 format
 | 
			
		||||
 
 | 
			
		||||
@@ -585,7 +585,6 @@ func Edit(ctx *context.APIContext) {
 | 
			
		||||
	//   description: name of the repo to edit
 | 
			
		||||
	//   type: string
 | 
			
		||||
	//   required: true
 | 
			
		||||
	//   required: true
 | 
			
		||||
	// - name: body
 | 
			
		||||
	//   in: body
 | 
			
		||||
	//   description: "Properties of a repo that you can edit"
 | 
			
		||||
 
 | 
			
		||||
@@ -48,11 +48,6 @@ func AddEmail(ctx *context.APIContext) {
 | 
			
		||||
	// produces:
 | 
			
		||||
	// - application/json
 | 
			
		||||
	// parameters:
 | 
			
		||||
	// - name: options
 | 
			
		||||
	//   in: body
 | 
			
		||||
	//   schema:
 | 
			
		||||
	//     "$ref": "#/definitions/CreateEmailOption"
 | 
			
		||||
	// parameters:
 | 
			
		||||
	// - name: body
 | 
			
		||||
	//   in: body
 | 
			
		||||
	//   schema:
 | 
			
		||||
 
 | 
			
		||||
@@ -26,7 +26,6 @@ import (
 | 
			
		||||
	"code.gitea.io/gitea/modules/structs"
 | 
			
		||||
 | 
			
		||||
	"github.com/google/uuid"
 | 
			
		||||
 | 
			
		||||
	"gopkg.in/yaml.v2"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -78,6 +78,7 @@ type GiteaDownloader struct {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// NewGiteaDownloader creates a gitea Downloader via gitea API
 | 
			
		||||
//
 | 
			
		||||
//	Use either a username/password or personal token. token is preferred
 | 
			
		||||
//	Note: Public access only allows very basic access
 | 
			
		||||
func NewGiteaDownloader(ctx context.Context, baseURL, repoPath, username, password, token string) (*GiteaDownloader, error) {
 | 
			
		||||
 
 | 
			
		||||
@@ -71,6 +71,7 @@ type GitlabDownloader struct {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// NewGitlabDownloader creates a gitlab Downloader via gitlab API
 | 
			
		||||
//
 | 
			
		||||
//	Use either a username/password, personal token entered into the username field, or anonymous/public access
 | 
			
		||||
//	Note: Public access only allows very basic access
 | 
			
		||||
func NewGitlabDownloader(ctx context.Context, baseURL, repoPath, username, password, token string) (*GitlabDownloader, error) {
 | 
			
		||||
@@ -374,6 +375,7 @@ type gitlabIssueContext struct {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// GetIssues returns issues according start and limit
 | 
			
		||||
//
 | 
			
		||||
//	Note: issue label description and colors are not supported by the go-gitlab library at this time
 | 
			
		||||
func (g *GitlabDownloader) GetIssues(page, perPage int) ([]*base.Issue, bool, error) {
 | 
			
		||||
	state := "all"
 | 
			
		||||
 
 | 
			
		||||
@@ -12420,6 +12420,18 @@
 | 
			
		||||
        "summary": "List the current user's tracked times",
 | 
			
		||||
        "operationId": "userCurrentTrackedTimes",
 | 
			
		||||
        "parameters": [
 | 
			
		||||
          {
 | 
			
		||||
            "type": "integer",
 | 
			
		||||
            "description": "page number of results to return (1-based)",
 | 
			
		||||
            "name": "page",
 | 
			
		||||
            "in": "query"
 | 
			
		||||
          },
 | 
			
		||||
          {
 | 
			
		||||
            "type": "integer",
 | 
			
		||||
            "description": "page size of results",
 | 
			
		||||
            "name": "limit",
 | 
			
		||||
            "in": "query"
 | 
			
		||||
          },
 | 
			
		||||
          {
 | 
			
		||||
            "type": "string",
 | 
			
		||||
            "format": "date-time",
 | 
			
		||||
@@ -15619,7 +15631,6 @@
 | 
			
		||||
          "$ref": "#/definitions/FileCommitResponse"
 | 
			
		||||
        },
 | 
			
		||||
        "content": {
 | 
			
		||||
          "type": "object",
 | 
			
		||||
          "x-go-name": "Content"
 | 
			
		||||
        },
 | 
			
		||||
        "verification": {
 | 
			
		||||
@@ -18661,7 +18672,6 @@
 | 
			
		||||
          "x-go-name": "Ignored"
 | 
			
		||||
        },
 | 
			
		||||
        "reason": {
 | 
			
		||||
          "type": "object",
 | 
			
		||||
          "x-go-name": "Reason"
 | 
			
		||||
        },
 | 
			
		||||
        "repository_url": {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user