Verified Commit 7190b026 authored by boklm's avatar boklm
Browse files

Update maint-14.5 -> maint-15.0 branch in MR and issue templates

parent 12226343

.gitlab/issue_templates/Backport.md

+2 −2
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.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

+2 −2
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.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` 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 Stable.md

+2 −2
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.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` 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
Original line number Diff line number Diff line
@@ -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