internal/task: update the go1.23rc1 announcement to mention gopls

findleyr · findleyr · commit c6411bd01404 · 2024-06-17T20:14:08.000Z
As of writing, it looks like we may not have gopls@v0.16.0 released prior to go1.23rc1. Therefore, we should inform users that they must install the gopls prerelease in order to test Go 1.23. Also simplify instructions by using the go1.23rc1 command from the command line. In the future, we should revert to the prior wording, and remove mention of go1.23rc1, just suggesting "at least Go 1.23". Also, use fenced code blocks for the command line instructions, as without these the installation line for gopls@v is linkified as a mailto: address. For consistency, do the same for other announcement emails. Fixes golang/go#67618 Change-Id: I64ac4fd9b0622683fc35ecddd9147d270e49471d Reviewed-on: https://go-review.googlesource.com/c/build/+/593055 Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com> Reviewed-by: Dmitri Shuralyov <dmitshur@google.com>
diff --git a/internal/task/announce_test.go b/internal/task/announce_test.go
@@ -104,9 +104,9 @@ This is CVE-2022-27536 and https://go.dev/issue/51759.`,
 			name: "announce-rc",
 			in: releaseAnnouncement{
 				Kind:    KindRC,
-				Version: "go1.23rc3",
+				Version: "go1.23rc1",
 			},
-			wantSubject: "Go 1.23 Release Candidate 3 is released",
+			wantSubject: "Go 1.23 Release Candidate 1 is released",
 		},
 		{
 			name: "announce-major",
diff --git a/internal/task/template/announce-beta.md b/internal/task/template/announce-beta.md
@@ -13,8 +13,11 @@ https://go.dev/issue/new
 
 If you have Go installed already, an easy way to try {{.Version}}
 is by using the go command:
+
+```
 $ go install golang.org/dl/{{.Version}}@latest
 $ {{.Version}} download
+```
 
 You can download binary and source distributions from the usual place:
 https://go.dev/dl/#{{.Version}}
diff --git a/internal/task/template/announce-major.md b/internal/task/template/announce-major.md
@@ -13,8 +13,10 @@ https://go.dev/dl/#{{.Version}}
 If you have Go installed already, an easy way to try {{.Version}}
 is by using the go command:
 
+```
 $ go install golang.org/dl/{{.Version}}@latest
 $ {{.Version}} download
+```
 
 To compile from source using a Git clone, update to the release with
 `git checkout {{.Version}}` and build as usual.
diff --git a/internal/task/template/announce-rc.md b/internal/task/template/announce-rc.md
@@ -14,21 +14,37 @@ https://go.dev/issue/new
 If you have Go installed already, an easy way to try {{.Version}}
 is by using the go command:
 
+```
 $ go install golang.org/dl/{{.Version}}@latest
 $ {{.Version}} download
+```
 
 You can download binary and source distributions from the usual place:
 https://go.dev/dl/#{{.Version}}
 
-{{ if atLeast .Version "go1.23" }}
+{{/* TODO(rfindley): update the go1.23rc1 sections once Go 1.23 is out. */ -}}
+
+{{ if eq .Version "go1.23rc1" }}
 To help validate the release, consider opting in to [Go toolchain telemetry](https://go.dev/doc/telemetry).
-If you're using go command version go1.23rc1 or later, you can opt in by
-running the following command:
+You can opt in by running the following command:
 
-$ go telemetry on
+```
+$ go1.23rc1 telemetry on
+```
 
 {{ end -}}
 
+{{ if eq .Version "go1.23rc1" }}
+If you use the gopls language server in your development workflow, please note
+that gopls v0.16.0-pre.1 is currently required for this release candidate.
+Install it with:
+
+```
+$ go1.23rc1 install golang.org/x/tools/gopls@v0.16.0-pre.1
+```
+
+{{end -}}
+
 To find out what has changed in Go {{.Version|major}}, read the draft release notes:
 https://tip.golang.org/doc/go{{.Version|major}}
 
diff --git a/internal/task/testdata/announce-beta.html b/internal/task/testdata/announce-beta.html
@@ -6,9 +6,10 @@
 <p>Report any problems using the issue tracker:<br>
 <a href="https://go.dev/issue/new">https://go.dev/issue/new</a></p>
 <p>If you have Go installed already, an easy way to try go1.19beta5<br>
-is by using the go command:<br>
-$ go install golang.org/dl/go1.19beta5@latest<br>
-$ go1.19beta5 download</p>
+is by using the go command:</p>
+<pre><code>$ go install golang.org/dl/go1.19beta5@latest
+$ go1.19beta5 download
+</code></pre>
 <p>You can download binary and source distributions from the usual place:<br>
 <a href="https://go.dev/dl/#go1.19beta5">https://go.dev/dl/#go1.19beta5</a></p>
 <p>To find out what has changed in Go 1.19, read the draft release notes:<br>
diff --git a/internal/task/testdata/announce-beta.txt b/internal/task/testdata/announce-beta.txt
@@ -11,6 +11,7 @@ https://go.dev/issue/new
 
 If you have Go installed already, an easy way to try go1.19beta5
 is by using the go command:
+
 $ go install golang.org/dl/go1.19beta5@latest
 $ go1.19beta5 download
 
diff --git a/internal/task/testdata/announce-major.html b/internal/task/testdata/announce-major.html
@@ -6,8 +6,9 @@
 <a href="https://go.dev/dl/#go1.21.0">https://go.dev/dl/#go1.21.0</a></p>
 <p>If you have Go installed already, an easy way to try go1.21.0<br>
 is by using the go command:</p>
-<p>$ go install golang.org/dl/go1.21.0@latest<br>
-$ go1.21.0 download</p>
+<pre><code>$ go install golang.org/dl/go1.21.0@latest
+$ go1.21.0 download
+</code></pre>
 <p>To compile from source using a Git clone, update to the release with<br>
 <code>git checkout go1.21.0</code> and build as usual.</p>
 <p>Thanks to everyone who contributed to the release!</p>
diff --git a/internal/task/testdata/announce-rc.html b/internal/task/testdata/announce-rc.html
@@ -1,20 +1,26 @@
 <p>Hello gophers,</p>
-<p>We have just released go1.23rc3, a release candidate version of Go 1.23.<br>
-It is cut from release-branch.go1.23 at the revision tagged go1.23rc3.</p>
+<p>We have just released go1.23rc1, a release candidate version of Go 1.23.<br>
+It is cut from release-branch.go1.23 at the revision tagged go1.23rc1.</p>
 <p>Please try your production load tests and unit tests with the new version.<br>
 Your help testing these pre-release versions is invaluable.</p>
 <p>Report any problems using the issue tracker:<br>
 <a href="https://go.dev/issue/new">https://go.dev/issue/new</a></p>
-<p>If you have Go installed already, an easy way to try go1.23rc3<br>
+<p>If you have Go installed already, an easy way to try go1.23rc1<br>
 is by using the go command:</p>
-<p>$ go install golang.org/dl/go1.23rc3@latest<br>
-$ go1.23rc3 download</p>
+<pre><code>$ go install golang.org/dl/go1.23rc1@latest
+$ go1.23rc1 download
+</code></pre>
 <p>You can download binary and source distributions from the usual place:<br>
-<a href="https://go.dev/dl/#go1.23rc3">https://go.dev/dl/#go1.23rc3</a></p>
+<a href="https://go.dev/dl/#go1.23rc1">https://go.dev/dl/#go1.23rc1</a></p>
 <p>To help validate the release, consider opting in to <a href="https://go.dev/doc/telemetry">Go toolchain telemetry</a>.<br>
-If you're using go command version go1.23rc1 or later, you can opt in by<br>
-running the following command:</p>
-<p>$ go telemetry on</p>
+You can opt in by running the following command:</p>
+<pre><code>$ go1.23rc1 telemetry on
+</code></pre>
+<p>If you use the gopls language server in your development workflow, please note<br>
+that gopls v0.16.0-pre.1 is currently required for this release candidate.<br>
+Install it with:</p>
+<pre><code>$ go1.23rc1 install golang.org/x/tools/gopls@v0.16.0-pre.1
+</code></pre>
 <p>To find out what has changed in Go 1.23, read the draft release notes:<br>
 <a href="https://tip.golang.org/doc/go1.23">https://tip.golang.org/doc/go1.23</a></p>
 <p>Cheers,<br>
diff --git a/internal/task/testdata/announce-rc.txt b/internal/task/testdata/announce-rc.txt
@@ -1,28 +1,33 @@
 Hello gophers,
 
-We have just released go1.23rc3, a release candidate version of Go 1.23.
-It is cut from release-branch.go1.23 at the revision tagged go1.23rc3.
+We have just released go1.23rc1, a release candidate version of Go 1.23.
+It is cut from release-branch.go1.23 at the revision tagged go1.23rc1.
 
 Please try your production load tests and unit tests with the new version.
 Your help testing these pre-release versions is invaluable.
 
 Report any problems using the issue tracker:
 https://go.dev/issue/new
 
-If you have Go installed already, an easy way to try go1.23rc3
+If you have Go installed already, an easy way to try go1.23rc1
 is by using the go command:
 
-$ go install golang.org/dl/go1.23rc3@latest
-$ go1.23rc3 download
+$ go install golang.org/dl/go1.23rc1@latest
+$ go1.23rc1 download
 
 You can download binary and source distributions from the usual place:
-https://go.dev/dl/#go1.23rc3
+https://go.dev/dl/#go1.23rc1
 
 To help validate the release, consider opting in to Go toolchain telemetry <https://go.dev/doc/telemetry>.
-If you're using go command version go1.23rc1 or later, you can opt in by
-running the following command:
+You can opt in by running the following command:
 
-$ go telemetry on
+$ go1.23rc1 telemetry on
+
+If you use the gopls language server in your development workflow, please note
+that gopls v0.16.0-pre.1 is currently required for this release candidate.
+Install it with:
+
+$ go1.23rc1 install golang.org/x/tools/gopls@v0.16.0-pre.1
 
 To find out what has changed in Go 1.23, read the draft release notes:
 https://tip.golang.org/doc/go1.23
