From 8862b63aa3a877072c90114bdcc56023f1e30d1d Mon Sep 17 00:00:00 2001
From: Rob Lemley <rob@thunderbird.net>
Date: Mon, 20 Nov 2023 10:37:36 -0500
Subject: [PATCH] Nikola auto commit.

Source commit: 5329359730fcb8eef369b5a66c2f94bae9cbdc1d
Nikola version: 8.2.4
---
 .../mergeday_email_templates/index.html       | 21 +++++++++++++++++--
 .../drivers/mergeday_email_templates/index.md | 12 +++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/documentation/drivers/mergeday_email_templates/index.html b/documentation/drivers/mergeday_email_templates/index.html
index 603c2d5..1bc360b 100644
--- a/documentation/drivers/mergeday_email_templates/index.html
+++ b/documentation/drivers/mergeday_email_templates/index.html
@@ -78,10 +78,18 @@
 <h2>Announcement Email</h2>
 <p><em>Send this email the morning of the merge.</em></p>
 <hr>
-<p><strong>Subject:</strong> Thunderbird beta merge for <span class="date today"></span> (c-c -&gt; <span class="milestone nightly"></span> / c-b -&gt; <span class="milestone beta"></span>)</p>
+<p><strong>Subject:</strong> Thunderbird merges &amp; version bumps for <span class="date today"></span> (c-c -&gt; <span class="milestone nightly"></span> 
+/ c-b -&gt; <span class="milestone beta"></span> / c-r -&gt; <span class="milestone release"></span>)</p>
 <p>Hello!</p>
 <p>I’ll be doing the beta merge today. The Firefox merges <strong>have <span id="ff_merge_negate">not</span></strong> completed.</p>
-<p>comm-central is going to version <span class="milestone nightly"></span>, and comm-beta to <span class="milestone beta"></span>.</p>
+<ul>
+<li>comm-central is going to version <span class="milestone nightly"></span>
+</li>
+<li>comm-beta to <span class="milestone beta"></span>
+</li>
+<li>comm-release to <span class="milestone release"></span>
+</li>
+</ul>
 <p>The merge will be performed via automation.</p>
 <p>I’ll keep people up to date by replying to this email:</p>
 <ul>
@@ -100,6 +108,10 @@ <h2>Conclusion Email</h2>
 <p><strong>Merges are finished.</strong></p>
 <p>Thunderbird <span class="milestone beta"></span>beta1 will be built once the Firefox build has
 been tagged in Mercurial.</p>
+<p>comm-release:</p>
+<ul>
+<li><strong>TREEHERDER LINK</strong></li>
+</ul>
 <p>comm-beta:</p>
 <ul>
 <li><strong>TREEHERDER LINK</strong></li>
@@ -118,6 +130,8 @@ <h2>Conclusion Email</h2>
 </ul>
 <p>current tree status:</p>
 <ul>
+<li>comm-release: <span style="weight:900; color:#f0ad4e">APPROVAL REQUIRED</span>
+</li>
 <li>comm-beta: <span style="weight:900; color:#f0ad4e">APPROVAL REQUIRED</span>
 </li>
 <li>comm-central: <span style="weight:900; color:#5cb85c">OPEN</span>
@@ -160,6 +174,7 @@ <h2>Conclusion Email</h2>
   // will be post merge so that the emails make sense.
   let tb_nightly_ms = Number(tb_nightly_ver.replace(".0a1\n", ""))
   let tb_beta_ms = tb_nightly_ms
+  let tb_release_ms = tb_beta_ms - 1
   tb_nightly_ms = tb_nightly_ms + 1
 
   // Check to see if the Firefox bump-central has happened. That's the last
@@ -173,6 +188,8 @@ <h2>Conclusion Email</h2>
 
   doReplaceMilestones("nightly", tb_nightly_ms.toString(10))
   doReplaceMilestones("beta", tb_beta_ms.toString(10))
+  doReplaceMilestones("release", tb_release_ms.toString(10))
+
   doReplaceToday()
 </script><script>
     baguetteBox.run('div#content', {
diff --git a/documentation/drivers/mergeday_email_templates/index.md b/documentation/drivers/mergeday_email_templates/index.md
index 5eae2d8..5db74d7 100644
--- a/documentation/drivers/mergeday_email_templates/index.md
+++ b/documentation/drivers/mergeday_email_templates/index.md
@@ -14,13 +14,16 @@ _Send this email the morning of the merge._
 
 ---
 
-**Subject:** Thunderbird beta merge for {{% today %}} (c-c -> {{% milestone nightly %}} / c-b -> {{% milestone beta %}})
+**Subject:** Thunderbird merges & version bumps for {{% today %}} (c-c -> {{% milestone nightly %}} 
+/ c-b -> {{% milestone beta %}} / c-r -> {{% milestone release %}})
 
 Hello!
 
 I’ll be doing the beta merge today. The Firefox merges **have <span id="ff_merge_negate">not</span>** completed.
 
-comm-central is going to version {{% milestone nightly %}}, and comm-beta to {{% milestone beta %}}.
+* comm-central is going to version {{% milestone nightly %}}
+* comm-beta to {{% milestone beta %}}
+* comm-release to {{% milestone release %}}
 
 The merge will be performed via automation.
 
@@ -49,6 +52,10 @@ _Send this email after you've completed the work._
 Thunderbird {{% milestone beta %}}beta1 will be built once the Firefox build has
 been tagged in Mercurial.
 
+comm-release:
+
+  * **TREEHERDER LINK**
+
 comm-beta:
 
   * **TREEHERDER LINK**
@@ -67,6 +74,7 @@ documentation:
 
 current tree status:
 
+  * comm-release: <span style="weight:900; color:#f0ad4e">APPROVAL REQUIRED</span>
   * comm-beta: <span style="weight:900; color:#f0ad4e">APPROVAL REQUIRED</span>
   * comm-central: <span style="weight:900; color:#5cb85c">OPEN</span>