morgan pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
-
7190b026
by Nicolas Vigier at 2025-11-18T17:24:59+01:00
-
de81ac36
by Nicolas Vigier at 2025-11-18T17:29:08+01:00
4 changed files:
- .gitlab/issue_templates/Backport.md
- .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md
- .gitlab/issue_templates/Release Prep - Tor Browser Stable.md
- .gitlab/merge_request_templates/default.md
Changes:
| ... | ... | @@ -2,7 +2,7 @@ |
| 2 | 2 | Title:
|
| 3 | 3 | Backport tor-browser-build-browser#12345: Title of Issue
|
| 4 | 4 | |
| 5 | -This is an issue for tracking back-porting a patch-set (e.g. from main to maint-14.5)
|
|
| 5 | +This is an issue for tracking back-porting a patch-set (e.g. from main to maint-15.0)
|
|
| 6 | 6 | -->
|
| 7 | 7 | |
| 8 | 8 | ## Backport Patchset
|
| ... | ... | @@ -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-14.5
|
|
| 22 | +- [ ] maint-15.0
|
|
| 23 | 23 | - [ ] maint-13.5
|
| 24 | 24 | |
| 25 | 25 | ### Notes
|
| ... | ... | @@ -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-14.5` branch
|
|
| 97 | + - **NOTE**: target the `maint-15.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-14.5` as the upstream branch with these values saved means you only need to periodically `git pull --rebase` and update the `set-config.tbb-version` file
|
|
| 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`
|
|
| 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
|
| ... | ... | @@ -145,10 +145,6 @@ Mullvad Browser Stable is on the `maint-${MULLVAD_BROWSER_MAJOR}.${MULLVAD_BROWS |
| 145 | 145 | - `appstoreconnect_api_key_path`: path to json file containing appstoreconnect api key infos
|
| 146 | 146 | - [ ] `set-config.update-responses`
|
| 147 | 147 | - `update_responses_repository_dir`: directory where you cloned `git@gitlab.torproject.org:tpo/applications/mullvad-browser-update-responses.git`
|
| 148 | - - [ ] `tor-browser-build/tools/signing/set-config.tbb-version`
|
|
| 149 | - - `tbb_version`: mullvad browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`)
|
|
| 150 | - - `tbb_version_build`: the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`)
|
|
| 151 | - - `tbb_version_type`: either `alpha` for alpha releases or `release` for stable releases
|
|
| 152 | 148 | - [ ] On `${STAGING_SERVER}` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050
|
| 153 | 149 | - [ ] On `${STAGING_SERVER}` in a separate `screen` session, run do-all-signing script:
|
| 154 | 150 | - Run:
|
| ... | ... | @@ -120,7 +120,7 @@ Tor Browser Stable is on the `maint-${TOR_BROWSER_MAJOR}.${TOR_BROWSER_MINOR}` b |
| 120 | 120 | - ESR updates correct
|
| 121 | 121 | - Component updates correct
|
| 122 | 122 | - [ ] Open MR with above changes, using the template for release preparations
|
| 123 | - - **NOTE**: target the `maint-14.5` branch
|
|
| 123 | + - **NOTE**: target the `maint-15.0` branch
|
|
| 124 | 124 | - [ ] Merge
|
| 125 | 125 | - [ ] Sign+Tag
|
| 126 | 126 | - **NOTE** this must be done by one of:
|
| ... | ... | @@ -214,7 +214,7 @@ Tor Browser Stable is on the `maint-${TOR_BROWSER_MAJOR}.${TOR_BROWSER_MINOR}` b |
| 214 | 214 | - **⚠️ WARNING**: Do not continue if the legacy channel has not been fully signed and published yet; it is needed for update-response generation!
|
| 215 | 215 | - **NOTE** Stable releases without a corresponding legacy release may ignore this
|
| 216 | 216 | - [ ] On `${STAGING_SERVER}`, ensure updated:
|
| 217 | - - **NOTE** Having a local git branch with `maint-14.5` as the upstream branch with these values saved means you only need to periodically `git pull --rebase` and update the `set-config.tbb-version` file
|
|
| 217 | + - **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`
|
|
| 218 | 218 | - [ ] `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}`
|
| 219 | 219 | - [ ] `tor-browser-build/tools/signing/set-config.hosts`
|
| 220 | 220 | - `ssh_host_builder`: ssh hostname of machine with unsigned builds
|
| ... | ... | @@ -224,10 +224,6 @@ Tor Browser Stable is on the `maint-${TOR_BROWSER_MAJOR}.${TOR_BROWSER_MINOR}` b |
| 224 | 224 | - `appstoreconnect_api_key_path`: path to json file containing appstoreconnect api key infos
|
| 225 | 225 | - [ ] `set-config.update-responses`
|
| 226 | 226 | - `update_responses_repository_dir`: directory where you cloned `git@gitlab.torproject.org:tpo/applications/tor-browser-update-responses.git`
|
| 227 | - - [ ] `tor-browser-build/tools/signing/set-config.tbb-version`
|
|
| 228 | - - `tbb_version`: tor browser version string, same as `var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`)
|
|
| 229 | - - `tbb_version_build`: the tor-browser-build build number (if `var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`)
|
|
| 230 | - - `tbb_version_type`: either `alpha` for alpha releases or `release` for stable releases
|
|
| 231 | 227 | - [ ] On `${STAGING_SERVER}` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050
|
| 232 | 228 | - [ ] On `${STAGING_SERVER}` in a separate `screen` session, run do-all-signing script:
|
| 233 | 229 | - Run:
|
| ... | ... | @@ -20,7 +20,7 @@ |
| 20 | 20 | |
| 21 | 21 | #### Target Branches
|
| 22 | 22 | - [ ] **`main`**: esr140-15.0
|
| 23 | - - [ ] **`maint-14.5`**: esr128-14.5
|
|
| 23 | + - [ ] **`maint-15.0`**: esr140-15.0
|
|
| 24 | 24 | - [ ] **`maint-13.5`**: esr115-13.5
|
| 25 | 25 | |
| 26 | 26 | ### Backporting
|