diff --git a/internal/task/tweet.go b/internal/task/tweet.go index f1e4025b96..304a161249 100644 --- a/internal/task/tweet.go +++ b/internal/task/tweet.go @@ -217,7 +217,13 @@ func tweetText(r ReleaseTweet, rnd *rand.Rand) (string, error) { ReleaseTweet: r, } } else if strings.Count(r.Version, ".") == 1 { // Major release like "go1.X". - name, data = "major", r + name, data = "major", struct { + Maj string + ReleaseTweet + }{ + Maj: r.Version[len("go"):], + ReleaseTweet: r, + } } else if strings.Count(r.Version, ".") == 2 { // Minor release like "go1.X.Y". name, data = "minor", struct { Curr, Prev string @@ -279,7 +285,7 @@ const tweetTextTmpl = `{{define "minor" -}} {{define "major" -}} -{{emoji "release"}} Go {{.Version}} is released! +{{emoji "release"}} Go {{.Maj}} is released! {{with .Security}}{{emoji "security"}} Security: {{.}}{{"\n\n"}}{{end -}} diff --git a/internal/task/tweet_test.go b/internal/task/tweet_test.go index f134981ed9..0948e6988b 100644 --- a/internal/task/tweet_test.go +++ b/internal/task/tweet_test.go @@ -128,7 +128,7 @@ go version go1.17rc2 windows/arm64` + "\n", RandomSeed: 123, }, wantLog: `tweet text: -🥳 Go go1.17 is released! +🥳 Go 1.17 is released! 🔐 Security: Includes a super duper security fix (CVE-123).