internal/relui: drop v6l suffix in release announcement images sooner

CL 584403 fixed the root problem affecting published download metadata,
but out of abundance of caution chose not to apply it to the remaining
Go 1.22/1.21 minor releases. It's definitely safe to do it in the image
generation sooner, though, so do that especially since the random dice
rolls were not kind in https://x.com/golang/status/1798068033287840156
and https://hachyderm.io/@golang/112559902031577502.

Change-Id: If725a021bb09732d223b5f70fb5bc1b5dde07947
Reviewed-on: https://go-review.googlesource.com/c/build/+/590595
Auto-Submit: Dmitri Shuralyov <[email protected]>
Reviewed-by: Dmitri Shuralyov <[email protected]>
Reviewed-by: Michael Knyszek <[email protected]>
LUCI-TryBot-Result: Go LUCI <[email protected]>

Author: dmitshur

internal/task/tweet.go

@@ -351,11 +351,15 @@ func tweetImage(published Published, rnd *rand.Rand) (imagePNG []byte, imageText
 	if err != nil {
 		return nil, "", err
 	}
+	goarch := a.GOARCH()
+	if CompareGoVersions(a.Version, "go1.23") == -1 && a.OS != "linux" { // TODO: Delete this after Go 1.24.0 is out and this becomes dead code.
+		goarch = strings.TrimSuffix(goarch, "v6l")
+	}
 	var buf bytes.Buffer
 	if err := goCmdTmpl.Execute(&buf, map[string]string{
 		"GoVer":    published.Version,
 		"GOOS":     a.OS,
-		"GOARCH":   a.GOARCH(),
+		"GOARCH":   goarch,
 		"Filename": a.Filename,
 		"ZeroSize": fmt.Sprintf("%*d", digits(a.Size), 0),
 		"HalfSize": fmt.Sprintf("%*d", digits(a.Size), a.Size/2),

internal/task/tweet_test.go

@@ -188,6 +188,37 @@ Success. You may now run 'go1.21.0'
 $ go1.21.0 version
 go version go1.21.0 freebsd/amd64` + "\n",
 	},
+	{
+		name: "fixup-v6l-suffix",
+		kind: KindMinor,
+		published: []Published{
+			{Version: "go1.22.4", Files: []WebsiteFile{{
+				OS: "windows", Arch: "armv6l",
+				Filename: "go1.22.4.windows-arm.zip", Size: 74142698, Kind: "archive"}},
+			},
+			{Version: "go1.21.11"},
+		},
+		announcement: "https://groups.google.com/g/golang-announce/c/XbxouI9gY7k",
+		randomSeed:   123,
+		wantLog: `tweet text:
+🥳 Go 1.22.4 and 1.21.11 are released!
+
+📢 Announcement: https://groups.google.com/g/golang-announce/c/XbxouI9gY7k
+
+⬇️ Download: https://go.dev/dl/#go1.22.4
+
+#golang
+tweet image:
+$ go install golang.org/dl/go1.22.4@latest
+$ go1.22.4 download
+Downloaded   0.0% (       0 / 74142698 bytes) ...
+Downloaded  50.0% (37071349 / 74142698 bytes) ...
+Downloaded 100.0% (74142698 / 74142698 bytes)
+Unpacking go1.22.4.windows-arm.zip ...
+Success. You may now run 'go1.22.4'
+$ go1.22.4 version
+go version go1.22.4 windows/arm` + "\n",
+	},
 }
 
 func TestTweetRelease(t *testing.T) {