Draft: Bug 43341: add rebase template for nightly-based Tor Browser Alpha and Bugzilla Triage Issue generation

Merge Info

Issues

Resolves

• #43298
• #43341

Merging

Target Branches

• tor-browser - !fixups to tor-browser-specific commits, new features, security backports
• base-browser and mullvad-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
  • ⚠️ IMPORTANT: Please list the base-browser-specific commits which need to be cherry-picked to the base-browser and mullvad-browser branches here

Target Channels

• Alpha: esr128-14.5
• Stable: esr128-14.0
• Legacy: esr115-13.5

Backporting

Timeline

• No Backport (preferred): patchset for the next major stable
• Immediate: patchset needed as soon as possible
• Next Minor Stable Release: patchset that needs to be verified in nightly before backport
• Eventually: patchset that needs to be verified in alpha before backport

(Optional) Justification

• Emergency security update: patchset fixes CVEs, 0-days, etc
• Censorship event: patchset enables censorship circumvention
• Critical bug-fix: patchset fixes a bug in core-functionality
• Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
• Sponsor required: patchset required for sponsor
• Localization: typos and other localization changes that should be also in the release branch
• Other: please explain

Issue Tracking

• Link resolved issues with appropriate Release Prep issue for changelog generation

Review

Request Reviewer

• Request review from an applications developer depending on modified system:
  • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since Gitlab only allows 1 reviewer)
  • accessibility : henry
  • android : clairehurst, dan
  • build system : boklm
  • extensions : ma1
  • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
  • fonts : pierov
  • frontend (implementation) : henry
  • frontend (review) : donuts, morgan
  • localization : henry, pierov
  • macOS : clairehurst, dan
  • nightly builds : boklm
  • rebases/release-prep : dan, ma1, pierov, morgan
  • security : jwilde, ma1
  • signing : boklm, morgan
  • updater : pierov
  • windows : jwilde, morgan
  • misc/other : pierov, morgan

Change Description

This MR includes a pair of new templates:

• Bugzilla Issue Template
  • Steps for running the script, posting the triage spreadsheet, etc
• Firefox Nightly Rebase template
  • Steps for incrementally rebasing a Firefox Nightly-based Tor Browser channel and cherry-picking new commits from Tor Browser Alpha
  • Ignores base-browser and mullvad-browser entirely

Some outstanding issues:

• the channel name collisions between Firefox and Tor Browser are unfortunate
• should we create a new short channel name for this Firefox Nightly-based Tor Browser
  • rapid could work to go along with the current set of legacy, stable, and alpha?
• unclear to me that the proposed methodology for pulling in new updates from Tor Browser Alpha is going to be fool-proof (i.e. how to be sure we don't lose commits particularly later in the release cycle as the range-diff becomes less and less trivial).

How Tested

Just documentation but verified renders seemingly correctly in GitLab.

TODO:

• run through the rebase template and ensure it actually makes sense
  • @pierov would appreciate your feedback here based on your own experiences, as well as a pointer to your range-diff generating script ( or an MR to add it to tor-browser-build.git/tools/browser :) )