ci: improve release docs (#18562)

3 files changed, 20 insertions, 9 deletions

diff --git a/tools/release/00_start_release.ts b/tools/release/00_start_release.ts
index dc3f4889d..e77d602b2 100755
--- a/tools/release/00_start_release.ts
+++ b/tools/release/00_start_release.ts
@@ -42,7 +42,9 @@ function getNextVersion(originalVersion: semver.SemVer) {
 function buildDenoReleaseInstructionsDoc() {
   const templateText = currentDirPath
     .join("release_doc_template.md")
-    .readTextSync();
+    .readTextSync()
+    .replaceAll("$BRANCH_NAME", `v${nextVersion.major}.${nextVersion.minor}`)
+    .replaceAll("$VERSION", nextVersion.toString());
   return `# Deno CLI ${nextVersion.toString()} Release Checklist\n\n${templateText}`;
 }
 
diff --git a/tools/release/05_create_release_notes.ts b/tools/release/05_create_release_notes.ts
index f3dba984a..07759975d 100755
--- a/tools/release/05_create_release_notes.ts
+++ b/tools/release/05_create_release_notes.ts
@@ -6,7 +6,6 @@ import { DenoWorkspace } from "./deno_workspace.ts";
 const workspace = await DenoWorkspace.load();
 
 // create a release notes file for the GH release draft
-await Deno.writeTextFile(
-  $.path.join(DenoWorkspace.rootDirPath, "./target/release/release-notes.md"),
-  workspace.getReleasesMdFile().getLatestReleaseText().fullText,
-);
+$.path(DenoWorkspace.rootDirPath)
+  .join("./target/release/release-notes.md")
+  .writeTextSync(workspace.getReleasesMdFile().getLatestReleaseText().fullText);
diff --git a/tools/release/release_doc_template.md b/tools/release/release_doc_template.md
index 2e65ae55c..fe36d1677 100644
--- a/tools/release/release_doc_template.md
+++ b/tools/release/release_doc_template.md
@@ -129,22 +129,32 @@ verify on GitHub that everything looks correct.
       GitHub draft release.
 
   The CI pipeline will create a release draft on GitHub
-  (https://github.com/denoland/deno/releases). Update the draft with the
-  contents of `Releases.md` that you previously added.
+  (https://github.com/denoland/deno/releases).
 
 - [ ] Upload Apple M1 build (`deno-aarch64-apple-darwin.zip`) to the release
       draft and to https://console.cloud.google.com/storage/browser/dl.deno.land
 
+  Send the following commands:
+
   ```
+  git fetch upstream $BRANCH_NAME && git checkout -B $BRANCH_NAME upstream/$BRANCH_NAME
   cargo build --release
   cd target/release
+  set DENO_VERSION (./deno -V)
+  echo "Built $DENO_VERSION"
+  test $DENO_VERSION = "deno $VERSION"; or begin; echo "Version didn't match!!!"; exit 1; end
   zip -r deno-aarch64-apple-darwin.zip deno
   ```
 
+  And ask them to upload to these links:
+
+  - https://console.cloud.google.com/storage/browser/dl.deno.land/release/v$VERSION
+  - https://github.com/denoland/deno/releases/
+
 - ⛔ Verify that:
   - [ ] There are 8 assets on the release draft.
   - [ ] There are 4 zip files for this version on
-        [dl.deno.land](https://console.cloud.google.com/storage/browser/dl.deno.land/release).
+        [dl.deno.land](https://console.cloud.google.com/storage/browser/dl.deno.land/release/v$VERSION).
   - [ ] The aarch64 Mac build was built from the correct branch AFTER the
         version bump and has the same version as the release when doing
         `deno -V` (ask someone with an M1 Mac to verify this if you don't have
@@ -201,5 +211,5 @@ script generates the symbols based on the latest tags.
 
 ## All done!
 
-- [ ] Write a message in company's #general channel:
+- [ ] Write a message in company's #cli channel:
       `:unlock: deno and deno_std are now unlocked`.