Commit 7a66b1f2 authored by boklm's avatar boklm Committed by morgan
Browse files

Update maint branch (maint-14.5) in MR and issue templates

parent fdf8d4c5

.gitlab/issue_templates/Backport.md

+2 −2
Changes for .gitlab/issue_templates/Backport.md: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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.0)

This is an issue for tracking back-porting a patch-set (e.g. from main to maint-14.5)

-->



## 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.0

- [ ] maint-14.5

- [ ] maint-13.5



### Notes

.gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md

+2 −2
Changes for .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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.0` branch

  - **NOTE**: target the `maint-14.5` 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.0` 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-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

  - [ ] `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/issue_templates/Release Prep - Tor Browser Legacy.md

+1 −1
Changes for .gitlab/issue_templates/Release Prep - Tor Browser Legacy.md: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ popd 
- [ ] **(Optional)** Generate and deploy new update responses

  - **NOTE**: This is only required if there will be no corresponding 14.0 release (i.e. this is an emergency legacy-only 13.5 release). Normally, legacy update responses are generated and deployed as part of the 14.0 release.

  - **⚠️ WARNING**: This is a little bit off the beaten track, ping boklm or morgan if you have any doubts

  - From the `maint-14.0` branch:

  - From the `maint-14.5` branch:

    - [ ] Update `rbm.conf`

      - [ ] `var/torbrowser_legacy_version`: update to `${TOR_BROWSER_VERSION}`

        - **NOTE** this is the browser version for the legacy branch, not the 14.0 branch

.gitlab/issue_templates/Release Prep - Tor Browser Stable.md

+2 −2
Changes for .gitlab/issue_templates/Release Prep - Tor Browser Stable.md: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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.0` branch

  - **NOTE**: target the `maint-14.5` 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.0` 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-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

  - [ ] `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/merge_request_templates/default.md

+1 −1
Changes for .gitlab/merge_request_templates/default.md: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#### Target Branches

  - [ ] **`main`**: esr128-14.5

  - [ ] **`maint-14.0`**: esr128-14.0

  - [ ] **`maint-14.5`**: esr128-14.5

  - [ ] **`maint-13.5`**: esr115-13.5



### Backporting