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: - .gitlab/issue_templates/010 Backport.md - .gitlab/issue_templates/020 Revert.md - .gitlab/issue_templates/041 Release Prep - Tor Browser Stable.md - .gitlab/issue_templates/051 Release Prep - Mullvad Browser Stable.md - .gitlab/merge_request_templates/default.md - rbm.local.conf.example Changes: ===================================== .gitlab/issue_templates/010 Backport.md ===================================== @@ -4,7 +4,7 @@ Title: Backport tor-browser-build-browser#12345: Title of Issue -This is an issue for tracking back-porting a patch-set (e.g. from main to maint-15.0) +This is an issue for tracking back-porting a patch-set (e.g. from main to maint-16.0) --> ## Book-keeping @@ -19,7 +19,7 @@ This is an issue for tracking back-porting a patch-set (e.g. from main to maint- ### Target Channels -- [ ] maint-15.0 +- [ ] maint-16.0 ## Notes ===================================== .gitlab/issue_templates/020 Revert.md ===================================== @@ -31,7 +31,7 @@ When should this patchset be reverted? ### Target Channels <!-- Which channel has the commits we need to revert? --> - [ ] main -- [ ] maint-15.0 +- [ ] maint-16.0 ## Notes ===================================== .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 - ESR updates correct - Component updates correct - [ ] Open MR with above changes, using the template for release preparations - - **NOTE**: target the `maint-15.0` branch + - **NOTE**: target the `maint-16.0` branch - [ ] Merge - [ ] Sign+Tag - **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 # paste changelog as quote here ``` - [ ] On `${STAGING_SERVER}`, ensure updated: - - **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` + - **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` - [ ] `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}` - [ ] `tor-browser-build/tools/signing/set-config.hosts` - `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 - ESR updates correct - Component updates correct - [ ] Open MR with above changes, using the template for release preparations - - **NOTE**: target the `maint-15.0` branch + - **NOTE**: target the `maint-16.0` branch - [ ] Merge - [ ] Sign+Tag - **NOTE** this must be done by one of: @@ -135,7 +135,7 @@ Mullvad Browser Stable is on the `maint-${MULLVAD_BROWSER_MAJOR}.${MULLVAD_BROWS - pierov - [ ] Ensure all builders have matching builds - [ ] On `${STAGING_SERVER}`, ensure updated: - - **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` + - **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` - [ ] `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}` - [ ] `tor-browser-build/tools/signing/set-config.hosts` - `ssh_host_builder`: ssh hostname of machine with unsigned builds ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -19,8 +19,8 @@ <!-- This block tells the merger where commits need to be merged and future code archaeologists where commits were *supposed* to be merged --> #### Target Branches - - [ ] **`main`**: rapid release, 16.0 - - [ ] **`maint-15.0`**: esr140-15.0 + - [ ] **`main`**: rapid release, 17.0 + - [ ] **`maint-16.0`**: esr153-16.0 ### Backporting ===================================== rbm.local.conf.example ===================================== @@ -100,7 +100,7 @@ var: # - browser-all # - mullvadbrowser # - ### If you are doing Tor Browser 'release' builds in the maint-15.0 + ### If you are doing Tor Browser 'release' builds in the maint-16.0 ### branch and 'alpha' builds in the main branch, you can use the ### following configuration: #clean: @@ -110,7 +110,7 @@ var: # - alpha # - browser-all # - torbrowser - # maint-15.0: + # maint-16.0: # - project: release # target: # - release View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8f... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8f... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help
participants (1)
-
boklm (@boklm)