[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser-build][main] Update gitlab templates for the new maint-16.0 branch

Title: GitLab

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

Commits:

  • 8fbc8589
    by Nicolas Vigier at 2026-11-10T16:07:37+01:00 
    Update gitlab templates for the new maint-16.0 branch

6 changed files:

Changes:

  • .gitlab/issue_templates/010 Backport.md
    ... ... @@ -4,7 +4,7 @@
    4 4 
     Title:
    5 5 
         Backport tor-browser-build-browser#12345: Title of Issue
    6 6
    7 
    -This is an issue for tracking back-porting a patch-set (e.g. from main to maint-15.0)
    7 
    +This is an issue for tracking back-porting a patch-set (e.g. from main to maint-16.0)
    8 8 
     -->
    9 9
    10 10 
     ## Book-keeping
    ... ... @@ -19,7 +19,7 @@ This is an issue for tracking back-porting a patch-set (e.g. from main to maint-
    19 19
    20 20 
     ### Target Channels
    21 21
    22 
    -- [ ] maint-15.0
    22 
    +- [ ] maint-16.0
    23 23
    24 24 
     ## Notes
    25 25

  • .gitlab/issue_templates/020 Revert.md
    ... ... @@ -31,7 +31,7 @@ When should this patchset be reverted?
    31 31 
     ### Target Channels
    32 32 
     <!-- Which channel has the commits we need to revert? -->
    33 33 
     - [ ] main
    34 
    -- [ ] maint-15.0
    34 
    +- [ ] maint-16.0
    35 35
    36 36 
     ## Notes
    37 37

  • .gitlab/issue_templates/041 Release Prep - Tor Browser Stable.md
    ... ... @@ -118,7 +118,7 @@ Tor Browser Stable is on the `maint-${TOR_BROWSER_MAJOR}.${TOR_BROWSER_MINOR}` b
    118 118 
         - ESR updates correct
    119 119 
         - Component updates correct
    120 120 
     - [ ] Open MR with above changes, using the template for release preparations
    121 
    -  - **NOTE**: target the `maint-15.0` branch
    121 
    +  - **NOTE**: target the `maint-16.0` branch
    122 122 
     - [ ] Merge
    123 123 
     - [ ] Sign+Tag
    124 124 
       - **NOTE** this must be done by one of:
    ... ... @@ -209,7 +209,7 @@ Tor Browser Stable is on the `maint-${TOR_BROWSER_MAJOR}.${TOR_BROWSER_MINOR}` b
    209 209 
         # paste changelog as quote here
    210 210 
         ```
    211 211 
     - [ ] On `${STAGING_SERVER}`, ensure updated:
    212 
    -  - **NOTE** Having a local git branch with `maint-15.0` as the upstream branch with these values saved means you only need to periodically `git pull --rebase`
    212 
    +  - **NOTE** Having a local git branch with `maint-16.0` as the upstream branch with these values saved means you only need to periodically `git pull --rebase`
    213 213 
       - [ ] `tor-browser-build` is on the right commit: `git tag -v tbb-${TOR_BROWSER_VERSION}-${TOR_BROWSER_BUILD_N} && git checkout tbb-${TOR_BROWSER_VERSION}-${TOR_BROWSER_BUILD_N}`
    214 214 
       - [ ] `tor-browser-build/tools/signing/set-config.hosts`
    215 215 
         - `ssh_host_builder`: ssh hostname of machine with unsigned builds

  • .gitlab/issue_templates/051 Release Prep - Mullvad Browser Stable.md
    ... ... @@ -94,7 +94,7 @@ Mullvad Browser Stable is on the `maint-${MULLVAD_BROWSER_MAJOR}.${MULLVAD_BROWS
    94 94 
         - ESR updates correct
    95 95 
         - Component updates correct
    96 96 
     - [ ] Open MR with above changes, using the template for release preparations
    97 
    -  - **NOTE**: target the `maint-15.0` branch
    97 
    +  - **NOTE**: target the `maint-16.0` branch
    98 98 
     - [ ] Merge
    99 99 
     - [ ] Sign+Tag
    100 100 
       - **NOTE** this must be done by one of:
    ... ... @@ -135,7 +135,7 @@ Mullvad Browser Stable is on the `maint-${MULLVAD_BROWSER_MAJOR}.${MULLVAD_BROWS
    135 135 
       - pierov
    136 136 
     - [ ] Ensure all builders have matching builds
    137 137 
     - [ ] On `${STAGING_SERVER}`, ensure updated:
    138 
    -  - **NOTE** Having a local git branch with `maint-15.0` as the upstream branch with these values saved means you only need to periodically `git pull --rebase`
    138 
    +  - **NOTE** Having a local git branch with `maint-16.0` as the upstream branch with these values saved means you only need to periodically `git pull --rebase`
    139 139 
       - [ ] `tor-browser-build` is on the right commit: `git tag -v mb-${MULLVAD_BROWSER_VERSION}-${MULLVAD_BROWSER_BUILD_N} && git checkout mb-${MULLVAD_BROWSER_VERSION}-${MULLVAD_BROWSER_BUILD_N}`
    140 140 
       - [ ] `tor-browser-build/tools/signing/set-config.hosts`
    141 141 
         - `ssh_host_builder`: ssh hostname of machine with unsigned builds

  • .gitlab/merge_request_templates/default.md
    ... ... @@ -19,8 +19,8 @@
    19 19 
     <!-- This block tells the merger where commits need to be merged and future code archaeologists where commits were *supposed* to be merged -->
    20 20
    21 21 
     #### Target Branches
    22 
    -  - [ ] **`main`**: rapid release, 16.0
    23 
    -  - [ ] **`maint-15.0`**: esr140-15.0
    22 
    +  - [ ] **`main`**: rapid release, 17.0
    23 
    +  - [ ] **`maint-16.0`**: esr153-16.0
    24 24
    25 25 
     ### Backporting
    26 26

  • rbm.local.conf.example
    ... ... @@ -100,7 +100,7 @@ var:
    100 100 
       #        - browser-all
    101 101 
       #        - mullvadbrowser
    102 102 
       #
    103 
    -  ### If you are doing Tor Browser 'release' builds in the maint-15.0
    103 
    +  ### If you are doing Tor Browser 'release' builds in the maint-16.0
    104 104 
       ### branch and 'alpha' builds in the main branch, you can use the
    105 105 
       ### following configuration:
    106 106 
       #clean:
    ... ... @@ -110,7 +110,7 @@ var:
    110 110 
       #        - alpha
    111 111 
       #        - browser-all
    112 112 
       #        - torbrowser
    113 
    -  #  maint-15.0:
    113 
    +  #  maint-16.0:
    114 114 
       #    - project: release
    115 115 
       #      target:
    116 116 
       #        - release

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8fbc8589bfe809461bdd6ccf41a938ea4d1b4364 at 96e40837326e0a2e9b3ec3d3c51e5abe 

    _______________________________________________
tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx