Merge remote-tracking branch 'upstream/main'

* upstream/main: Fix unstable emoji sort (go-gitea#22346)
zjjhot · Jan 6, 2023 · 1d1ddbc · 1d1ddbc
2 parents e1ec9b2 + f74293f
commit 1d1ddbc
Show file tree

Hide file tree

Showing 2 changed files with 1,517 additions and 1,513 deletions.
diff --git a/build/generate-emoji.go b/build/generate-emoji.go
@@ -189,6 +189,10 @@ func generate() ([]byte, error) {
 		}
 	}
 
+	sort.Slice(data, func(i, j int) bool {
+		return data[i].Aliases[0] < data[j].Aliases[0]
+	})
+
 	// add header
 	str := replacer.Replace(fmt.Sprintf(hdr, gemojiURL, data))