Skip to content

Commit

Permalink
Nikola auto commit.
Browse files Browse the repository at this point in the history 
Source commit: afb91df
Nikola version: 8.3.1
  • Loading branch information
@jfx2006
jfx2006 committed Aug 5, 2024
1 parent ce69bf0 commit d41891d
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 40 deletions.
34 changes: 14 additions & 20 deletions documentation/drivers/merge_duty/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ <h2>Merge Duty</h2>
referenced below are relative to <em>Merge Day</em>, which is 1 week before the
traditional Thunderbird merge-day, now known as <em>version bump day</em>.</p>
<h3>Email templates</h3>
<p>See <a href="mergeday_email_templates">Merge Email Templates</a> for the email templates.</p>
<p>See <a href="../mergeday_email_templates/">Merge Email Templates</a> for the email templates.</p>
<h3>Overview of Procedure</h3>
<ul>
<li>Prep work a week before the merge<ul>
Expand Down Expand Up @@ -237,6 +237,10 @@ <h4>Merge central to beta</h4>
<li>Email <a href="mailto:[email protected]">thunderbird-drivers</a> and <a href="mailto:[email protected]">tb-sheriffs</a>
that the merge is beginning using the template.</li>
<li>Close <code>comm-central</code> in <a href="https://lando.services.mozilla.com/treestatus/">TreeStatus</a>.</li>
<li>On a local comm-central checkout, run <code>mach tb-rust check-upstream</code>. Make sure
that you have the latest revision of both comm-central and mozilla-central. If
that command reports that an update is needed, run <code>mach tb-rust vendor</code> and push
the changes to comm-central before proceeding.</li>
<li>Run the <code>comm-central -&gt; comm-beta</code> <a href="#do-migration-no-op-trial-runs">no-op trial
run</a> one more time, and verify the diff looks
correct.</li>
Expand All @@ -257,7 +261,8 @@ <h4>Merge central to beta</h4>
<ol start="2">
<li>Verify that <code>mail/locales/l10n-changesets.json</code> has revisions, not
<code>default</code>.</li>
<li>At the same time <code>comm-central</code> should get a new tag <code>BETA_xxx_BASE</code>.</li>
<li>At the same time <code>comm-central</code> should get a new tag <code>BETA_xxx_BASE</code>
</li>
</ol>
<div class="admonition warning">
<p class="admonition-title">Warning</p>
Expand Down Expand Up @@ -292,20 +297,20 @@ <h4>Tag comm-central and bump versions</h4>
<li>Upon successful run, <code>comm-central</code> should get a version bump commit and a
new tag <code>NIGHTLY_xxx_END</code>.</li>
</ol>
<h4>Bump ESR version</h4>
<h4>Bump ESR version (maybe)</h4>
<div class="admonition note">
<p class="admonition-title">Note</p>
<p>You could have one ESR to bump, or two. If you are not sure, ask.</p>
</div>
<p>Run the comm-bump-esr115 <a href="#do-migration-no-op-trial-runs">no-op trial run</a>
<p>Run the comm-bump-esr128 <a href="#do-migration-no-op-trial-runs">no-op trial run</a>
one more time, and verify the output.</p>
<p>Push your changes generated by the no-op trial run:</p>
<ol>
<li>Follow the <a href="#general-steps">general steps</a>
</li>
<li>Insert the following payload and click submit.</li>
</ol>
<div class="code"><pre class="code literal-block"><span class="nt">behavior</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">comm-bump-esr115</span>
<div class="code"><pre class="code literal-block"><span class="nt">behavior</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">comm-bump-esr128</span>
<span class="nt">force-dry-run</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">false</span>
<span class="nt">push</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">true</span>
</pre></div>
Expand All @@ -316,25 +321,14 @@ <h4>Bump ESR version</h4>
versions can be added to <code>taskcluster/ci/config.yml</code>.</p>
</div>
<ol start="3">
<li>Upon successful run, <code>mozilla-esr${VERSION}</code> should get a version bump commit.</li>
<li>Upon successful run, <code>comm-esr${VERSION}</code> should get a version bump commit.</li>
</ol>
<h4>Reply to thunderbird-drivers that version bump completed</h4>
<p>Reply to the migration request with the template.</p>
<h4>Bump Nightly version and release dates in ShipIt</h4>
<p>In ShipIt, the Thunderbird nightly version is hard-coded, and must be updated
after the version bump on comm-central.</p>
<p>Follow these steps to bump the nightly version and release dates in ShipIt:</p>
<ul>
<li>Modify <code>api/src/shipit_api/common/config.py</code> and update the
<code>LATEST_THUNDERBIRD_NIGHTLY_VERSION</code> variable to be the new version of
comm-central.</li>
<li>Create a pull request with the changes. <a href="https://github.com/mozilla-releng/shipit/pull/1004">Example</a>
</li>
<li>In the pull request, @mention one of the Ship-It code owners to make sure
the request is seen. You can also say something in #releaseduty on Matrix.</li>
</ul>
<p>If you are not familiar with Github's Fork &amp; Pull workflow model,
see <a href="https://reflectoring.io/github-fork-and-pull/">here</a> for an introduction.</p>
<p>Since June 2024 and <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1899904">bug 1899904</a>,
it is no longer necessary to update ShipIt when bumping the version on
comm-central.</p>
</div>

</article></main>
Expand Down
33 changes: 13 additions & 20 deletions documentation/drivers/merge_duty/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ traditional Thunderbird merge-day, now known as *version bump day*.

## Email templates

See [Merge Email Templates](mergeday_email_templates) for the email templates.
See [Merge Email Templates](/documentation/drivers/mergeday_email_templates/) for the email templates.

## Overview of Procedure

Expand Down Expand Up @@ -163,6 +163,10 @@ to mozilla-beta.
1. Email [thunderbird-drivers](mailto:[email protected]) and [tb-sheriffs](mailto:[email protected])
that the merge is beginning using the template.
2. Close `comm-central` in [TreeStatus](https://lando.services.mozilla.com/treestatus/).
3. On a local comm-central checkout, run `mach tb-rust check-upstream`. Make sure
that you have the latest revision of both comm-central and mozilla-central. If
that command reports that an update is needed, run `mach tb-rust vendor` and push
the changes to comm-central before proceeding.
1. Run the `comm-central -> comm-beta` [no-op trial
run](#do-migration-no-op-trial-runs) one more time, and verify the diff looks
correct.
Expand All @@ -183,7 +187,7 @@ push: true

2. Verify that `mail/locales/l10n-changesets.json` has revisions, not
`default`.
3. At the same time `comm-central` should get a new tag `BETA_xxx_BASE`.
3. At the same time `comm-central` should get a new tag `BETA_xxx_BASE`

!!! warning

Expand Down Expand Up @@ -222,13 +226,13 @@ push: true
3. Upon successful run, `comm-central` should get a version bump commit and a
new tag `NIGHTLY_xxx_END`.

### Bump ESR version
### Bump ESR version (maybe)

!!! note

You could have one ESR to bump, or two. If you are not sure, ask.

Run the comm-bump-esr115 [no-op trial run](#do-migration-no-op-trial-runs)
Run the comm-bump-esr128 [no-op trial run](#do-migration-no-op-trial-runs)
one more time, and verify the output.


Expand All @@ -238,7 +242,7 @@ Push your changes generated by the no-op trial run:
2. Insert the following payload and click submit.

```yaml
behavior: comm-bump-esr115
behavior: comm-bump-esr128
force-dry-run: false
push: true
```
Expand All @@ -248,26 +252,15 @@ push: true
The esr version is currently hardcoded to the action; If necessary, an action for other esr
versions can be added to `taskcluster/ci/config.yml`.

3. Upon successful run, `mozilla-esr${VERSION}` should get a version bump commit.
3. Upon successful run, `comm-esr${VERSION}` should get a version bump commit.

### Reply to thunderbird-drivers that version bump completed

Reply to the migration request with the template.

### Bump Nightly version and release dates in ShipIt

In ShipIt, the Thunderbird nightly version is hard-coded, and must be updated
after the version bump on comm-central.

Follow these steps to bump the nightly version and release dates in ShipIt:

* Modify `api/src/shipit_api/common/config.py` and update the
`LATEST_THUNDERBIRD_NIGHTLY_VERSION` variable to be the new version of
comm-central.
* Create a pull request with the changes. [Example](https://github.com/mozilla-releng/shipit/pull/1004)
* In the pull request, @mention one of the Ship-It code owners to make sure
the request is seen. You can also say something in #releaseduty on Matrix.

If you are not familiar with Github's Fork & Pull workflow model,
see [here](https://reflectoring.io/github-fork-and-pull/) for an introduction.
Since June 2024 and [bug 1899904](https://bugzilla.mozilla.org/show_bug.cgi?id=1899904),
it is no longer necessary to update ShipIt when bumping the version on
comm-central.

0 comments on commit d41891d

Please sign in to comment.