morgan pushed to branch main at The Tor Project / Applications / tor-browser-build

Commits:

2 changed files:

Changes:

  • .gitlab/merge_request_templates/default.md
    ... ... @@ -2,18 +2,34 @@
    2 2
    3 3 
     <!-- Bookkeeping information for release management -->
    4 4
    5 
    -### Related Issues
    5 
    +### Issues
    6 
    +
    7 
    +#### Resolves
    8 
    +- tor-browser-build#xxxxx
    6 9 
     - tor-browser#xxxxx
    7 10 
     - mullvad-browser#xxxxx
    11 
    +
    12 
    +#### Related
    8 13 
     - tor-browser-build#xxxxx
    14 
    +- tor-browser#xxxxx
    15 
    +- mullvad-browser#xxxxx
    16 
    +
    17 
    +### Merging
    18 
    +
    19 
    +<!-- This block tells the merger where commits need to be merged and future code archaeologists where commits were *supposed* to be merged -->
    20 
    +
    21 
    +#### Target Branches
    22 
    +  - [ ] **`main`**: esr128-14.5
    23 
    +  - [ ] **`maint-14.0`**: esr128-14.0
    24 
    +  - [ ] **`maint-13.5`**: esr115-13.5
    9 25
    10 26 
     ### Backporting
    11 27
    12 28 
     #### Timeline
    29 
    +- [ ] **No Backport (preferred)**: patchset for the next major stable
    13 30 
     - [ ] **Immediate**: patchset needed as soon as possible
    14 31 
     - [ ] **Next Minor Stable Release**: patchset that needs to be verified in nightly before backport
    15 32 
     - [ ] **Eventually**: patchset that needs to be verified in alpha before backport
    16 
    -- [ ] **No Backport (preferred)**: patchset for the next major stable
    17 33
    18 34 
     #### (Optional) Justification
    19 35 
     - [ ] **Emergency security update**: patchset fixes CVEs, 0-days, etc
    ... ... @@ -50,7 +66,7 @@
    50 66 
       - **windows** : jwilde, morgan
    51 67 
       - **misc/other** : morgan, pierov
    52 68
    53 
    -### Change Description
    69 
    +#### Change Description
    54 70
    55 71 
     <!-- Whatever context the reviewer needs to effectively review the patchset; if the patch includes UX updates be sure to include screenshots/video of how any new behaviour -->
    56 72

  • .gitlab/merge_request_templates/relprep.md
    1 
    -## Related Issues
    1 
    +## Release Prep
    2 2
    3 
    +### Issues
    4 
    +
    5 
    +#### Resolves
    6 
    +
    7 
    +- tor-browser-build#xxxxx
    3 8 
     - tor-browser-build#xxxxx
    9 
    +
    10 
    +#### Related
    11 
    +
    4 12 
     - tor-browser-build#xxxxx
    13 
    +- tor-browser#xxxxx
    14 
    +- mullvad-browser#xxxxx
    5 15
    6 
    -## Self-review + reviewer's template
    16 
    +### Self-review + reviewer's template
    7 17
    8 18 
     - [ ] `rbm.conf` updates:
    9 19 
       - [ ] `var/torbrowser_version`
    ... ... @@ -15,12 +25,12 @@
    15 25 
     - [ ] Tag updates:
    16 26 
       - [ ] [Firefox](https://gitlab.torproject.org/tpo/applications/tor-browser/-/tags)
    17 27 
       - [ ] Geckoview - should match Firefox
    18 
    -  - Tags might be speculative in the release preparation: i.e., they might not exist yet.
    28 
    +  - **NOTE**: Tags might be speculative in the release preparation: i.e., they might not exist yet.
    19 29 
     - [ ] Addon updates:
    20 30 
       - [ ] [NoScript](https://addons.mozilla.org/en-US/firefox/addon/noscript/)
    21 31 
       - [ ] [uBlock Origin](https://addons.mozilla.org/en-US/firefox/addon/ublock-origin/) (Mullvad Browser only)
    22 32 
       - [ ] [Mullvad Browser Extension](https://github.com/mullvad/browser-extension/releases) (Mullvad Browser only)
    23 
    -  - For AMO extension (NoScript and uBlock), updating the version in the URL is not enough, check that also a numeric ID from the URL has changed
    33 
    +  - ⚠️ **IMPORTANT**: For AMO extension (NoScript and uBlock), updating the version in the URL is not enough, check that also a numeric ID from the URL has changed
    24 34 
     - [ ] Tor and dependencies updates (Tor Browser only)
    25 35 
       - [ ] [Tor](https://gitlab.torproject.org/tpo/core/tor/-/tags)
    26 36 
       - [ ] [OpenSSL](https://www.openssl.org/source/): we stay on the latest LTS channel (currently 3.0.x)
    ... ... @@ -39,11 +49,11 @@
    39 49 
         - If you find errors such as platform or category (build system) please adjust the issue label accordingly
    40 50 
         - You can run `tools/relprep.py --only-changelogs --date $date $version` to update only the changelogs
    41 51
    42 
    -## Review
    52 
    +### Review
    43 53
    44 
    -### Request Reviewer
    54 
    +#### Request Reviewer
    45 55
    46 56 
     - [ ] Request review from a release engineer: boklm, dan, ma1, morgan, pierov
    47 57
    48 
    -### Change Description
    58 
    +#### Change Description
    49 59

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help