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
Update maint-14.5 -> maint-15.0 branch in MR and issue templates
- - - - -
de81ac36 by Nicolas Vigier at 2025-11-18T17:29:08+01:00
Bug 41625: Remove set-config.tbb-version refs from relprep issue templates
In 810e8e207b5e4f568c25c3b3817873fa11684606 we removed
set-config.tbb-version, which is now in the stable branch, so can be
removed from the stable relprep issue templates too.
- - - - -
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:
=====================================
.gitlab/issue_templates/Backport.md
=====================================
@@ -2,7 +2,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-14.5)
+This is an issue for tracking back-porting a patch-set (e.g. from main to
maint-15.0)
-->
## Backport Patchset
@@ -19,7 +19,7 @@ This is an issue for tracking back-porting a patch-set (e.g.
from main to maint-
#### Target Channels
-- [ ] maint-14.5
+- [ ] maint-15.0
- [ ] maint-13.5
### Notes
=====================================
.gitlab/issue_templates/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-14.5` branch
+ - **NOTE**: target the `maint-15.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-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
+ - **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`
- [ ] `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
@@ -145,10 +145,6 @@ Mullvad Browser Stable is on the
`maint-${MULLVAD_BROWSER_MAJOR}.${MULLVAD_BROWS
- `appstoreconnect_api_key_path`: path to json file containing
appstoreconnect api key infos
- [ ] `set-config.update-responses`
- `update_responses_repository_dir`: directory where you cloned
`[email protected]:tpo/applications/mullvad-browser-update-responses.git`
- - [ ] `tor-browser-build/tools/signing/set-config.tbb-version`
- - `tbb_version`: mullvad browser version string, same as
`var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`)
- - `tbb_version_build`: the tor-browser-build build number (if
`var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`)
- - `tbb_version_type`: either `alpha` for alpha releases or `release` for
stable releases
- [ ] On `${STAGING_SERVER}` in a separate `screen` session, ensure tor daemon
is running with SOCKS5 proxy on the default port 9050
- [ ] On `${STAGING_SERVER}` in a separate `screen` session, run
do-all-signing script:
- Run:
=====================================
.gitlab/issue_templates/Release Prep - Tor Browser Stable.md
=====================================
@@ -120,7 +120,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-14.5` branch
+ - **NOTE**: target the `maint-15.0` branch
- [ ] Merge
- [ ] Sign+Tag
- **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
- **⚠️ WARNING**: Do not continue if the legacy channel has not been fully
signed and published yet; it is needed for update-response generation!
- **NOTE** Stable releases without a corresponding legacy release may ignore
this
- [ ] On `${STAGING_SERVER}`, ensure updated:
- - **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
+ - **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`
- [ ] `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
@@ -224,10 +224,6 @@ Tor Browser Stable is on the
`maint-${TOR_BROWSER_MAJOR}.${TOR_BROWSER_MINOR}` b
- `appstoreconnect_api_key_path`: path to json file containing
appstoreconnect api key infos
- [ ] `set-config.update-responses`
- `update_responses_repository_dir`: directory where you cloned
`[email protected]:tpo/applications/tor-browser-update-responses.git`
- - [ ] `tor-browser-build/tools/signing/set-config.tbb-version`
- - `tbb_version`: tor browser version string, same as
`var/torbrowser_version` in `rbm.conf` (examples: `11.5a12`, `11.0.13`)
- - `tbb_version_build`: the tor-browser-build build number (if
`var/torbrowser_build` in `rbm.conf` is `buildN` then this value is `N`)
- - `tbb_version_type`: either `alpha` for alpha releases or `release` for
stable releases
- [ ] On `${STAGING_SERVER}` in a separate `screen` session, ensure tor daemon
is running with SOCKS5 proxy on the default port 9050
- [ ] On `${STAGING_SERVER}` in a separate `screen` session, run
do-all-signing script:
- Run:
=====================================
.gitlab/merge_request_templates/default.md
=====================================
@@ -20,7 +20,7 @@
#### Target Branches
- [ ] **`main`**: esr140-15.0
- - [ ] **`maint-14.5`**: esr128-14.5
+ - [ ] **`maint-15.0`**: esr140-15.0
- [ ] **`maint-13.5`**: esr115-13.5
### Backporting
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/122263438f7ccc961411a598cbfc08d639117dc8...de81ac36a9cf68d4306a542e0e37b0a00462d1bf
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/122263438f7ccc961411a598cbfc08d639117dc8...de81ac36a9cf68d4306a542e0e37b0a00462d1bf
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
