Skip to content

Commit 1c23949

Browse files
dmitshurgopherbot
authored andcommitted
internal/task: remove repetition in major Go release tweets
There was accidentally one too many "go" in the tweet text for the major Go release type. Updates golang/go#47403. Updates golang/go#40279. Change-Id: I7983bdb78f22c258121348a6cfaa2ed66592db54 Reviewed-on: https://go-review.googlesource.com/c/build/+/393018 Trust: Dmitri Shuralyov <[email protected]> Run-TryBot: Dmitri Shuralyov <[email protected]> Auto-Submit: Dmitri Shuralyov <[email protected]> TryBot-Result: Gopher Robot <[email protected]> Reviewed-by: Heschi Kreinick <[email protected]>
1 parent 567a2d2 commit 1c23949

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

internal/task/tweet.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,13 @@ func tweetText(r ReleaseTweet, rnd *rand.Rand) (string, error) {
217217
ReleaseTweet: r,
218218
}
219219
} else if strings.Count(r.Version, ".") == 1 { // Major release like "go1.X".
220-
name, data = "major", r
220+
name, data = "major", struct {
221+
Maj string
222+
ReleaseTweet
223+
}{
224+
Maj: r.Version[len("go"):],
225+
ReleaseTweet: r,
226+
}
221227
} else if strings.Count(r.Version, ".") == 2 { // Minor release like "go1.X.Y".
222228
name, data = "minor", struct {
223229
Curr, Prev string
@@ -279,7 +285,7 @@ const tweetTextTmpl = `{{define "minor" -}}
279285
280286
281287
{{define "major" -}}
282-
{{emoji "release"}} Go {{.Version}} is released!
288+
{{emoji "release"}} Go {{.Maj}} is released!
283289
284290
{{with .Security}}{{emoji "security"}} Security: {{.}}{{"\n\n"}}{{end -}}
285291

internal/task/tweet_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ go version go1.17rc2 windows/arm64` + "\n",
128128
RandomSeed: 123,
129129
},
130130
wantLog: `tweet text:
131-
🥳 Go go1.17 is released!
131+
🥳 Go 1.17 is released!
132132
133133
🔐 Security: Includes a super duper security fix (CVE-123).
134134

0 commit comments

Comments
 (0)