Commit ae04fe1d authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by richard
Browse files

Update the GitLab templates. 

Update the release preparations for the new changelog script arguments
and also to fix some steps that were not correct anymore.
parent 2854ab80

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

+19 −46
Original line number Diff line number Diff line
@@ -63,25 +63,19 @@ 
        - [ ] `URL`

        - [ ] `sha256sum`

    - [ ] Update `ChangeLog-MB.txt`

    - [ ] Ensure ChangeLog-MB.txt is sync'd between alpha and stable branches

      - [ ] Ensure `ChangeLog-MB.txt` is sync'd between alpha and stable branches

      - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones

    - [ ] Run `tools/fetch-changelogs.py $(TOR_BROWSER_VERSION)` or `tools/fetch-changelogs.py '#$(ISSUE_NUMBER)'`

      - [ ] Run `tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs`

        - Make sure you have `requests` installed (e.g., `apt install python3-requests`)

        - The first time you run this script you will need to generate an access token; the script will guide you

    - [ ] Copy the output of the script to the beginning of `ChangeLog-MB.txt` and update its output

      - [ ] Version

      - [ ] Browser Name

      - [ ] Release Date

    - [ ] Under `All Platforms` include any version updates for:

      - NoScript

      - uBlock-origin

      - Mullvad Browser Extension

      - Firefox

  - [ ] Open MR with above changes

  - [ ] Build the MR after initial review on at least two of:

    - [ ] Tor Project build machine

    - [ ] Mullvad build machine

    - [ ] Local developer machine

        - `$updateArgs` should be these arguments, depending on what you actually updated:

          - [ ] `--firefox`

          - [ ] `--no-script`

          - [ ] `--ublock`

          - E.g., `tools/fetch-changelogs.py 41029 --date 'December 19 2023' --firefox 115.6.0esr --no-script 11.4.29 --ublock 1.54.0`

        - `--date $date` is optional, if omitted it will be the date on which you run the command

      - [ ] Copy the output of the script to the beginning of `ChangeLog-MB.txt` and adjust its output

  - [ ] Open MR with above changes, using the template for release preparations

  - [ ] Ensure builders have matching builds

  - [ ] Merge

  - [ ] Sign+Tag
@@ -92,32 +86,11 @@ 
      - pierov

      - richard

    - [ ] Run: `make mullvadbrowser-signtag-alpha`

    - [ ] Push tag to `origin`



</details>



<details>

  <summary>QA</summary>



  ### send the build

  - [ ] Email Mullvad QA: support@mullvad.net, rui@mullvad.net

    <details>

      <summary>email template</summary>



        Subject:

        New build: Mullvad Browser $(MULLVAD_BROWSER_VERION) (unsigned)



        Body:

        unsigned builds: https://tb-build-05.torproject.org/~$(BUILDER)/builds/mullvadbrowser/alpha/unsigned/$(MB_BUILD_TAG)



        changelog:

        ...



    </details>



    - ***(Optional)*** Add additional information:

      - [ ] Note any new functionality which needs testing

      - [ ] Link to any known issues

  - [ ] Push tag to `upstream`

  - [ ] Build the tag on at least two of:

    - [ ] Tor Project build machine

    - [ ] Mullvad build machine

    - [ ] Local developer machine



</details>

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

+15 −28
Original line number Diff line number Diff line
@@ -60,7 +60,20 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU 
    - [ ] ***(Optional)*** If new version available, update `mullvad-extension` section of `input_files` in `projects/browser/config`

      - [ ] `URL`

      - [ ] `sha256sum`

- [ ] Open MR with above changes

- [ ] Update `ChangeLog-MB.txt`

  - [ ] Ensure `ChangeLog-MB.txt` is sync'd between alpha and stable branches

  - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones

  - [ ] Run `tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs`

    - Make sure you have `requests` installed (e.g., `apt install python3-requests`)

    - The first time you run this script you will need to generate an access token; the script will guide you

    - `$updateArgs` should be these arguments, depending on what you actually updated:

      - [ ] `--firefox`

      - [ ] `--no-script`

      - [ ] `--ublock`

      - E.g., `tools/fetch-changelogs.py 41029 --date 'December 19 2023' --firefox 115.6.0esr --no-script 11.4.29 --ublock 1.54.0`

    - `--date $date` is optional, if omitted it will be the date on which you run the command

  - [ ] Copy the output of the script to the beginning of `ChangeLog-MB.txt` and adjust its output

- [ ] Open MR with above changes, using the template for release preparations

- [ ] Merge

- [ ] Sign/Tag commit: `make mullvadbrowser-signtag-release`

- [ ] Push tag to `origin`
@@ -70,32 +83,6 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU 


</details>



<details>

  <summary>QA</summary>



### send the build



  - [ ] Email Mullvad QA: support@mullvad.net, rui@mullvad.net

    <details>

      <summary>email template</summary>



        Subject:

        New build: Mullvad Browser $(MULLVAD_BROWSER_VERION) (unsigned)



        Body:

        unsigned builds: https://tb-build-05.torproject.org/~$(BUILDER)/builds/mullvadbrowser/release/unsigned/$(MB_BUILD_TAG)



        changelog:

        ...



    </details>



    - ***(Optional)*** Add additional information:

      - [ ] Note any new functionality which needs testing

      - [ ] Link to any known issues



</details>



<details>

  <summary>Signing</summary>
@@ -192,4 +179,4 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU 


</details>



/label ~"Release Prep"
 
/label ~"Release Prep" ~"Sponsor 131"

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

+13 −21
Original line number Diff line number Diff line
@@ -93,30 +93,22 @@ 
          - [ ] Change the `version` to `$PIPELINEID`

          - [ ] Update `sha256sum` in the `input_files` section

  - [ ] Update `ChangeLog-TBB.txt`

    - [ ] Ensure ChangeLog-TBB.txt is sync'd between alpha and stable branches

    - [ ] Ensure `ChangeLog-TBB.txt` is sync'd between alpha and stable branches

    - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones

    - [ ] Run `tools/fetch-changelogs.py $(TOR_BROWSER_VERSION)` or `tools/fetch-changelogs.py '#$(ISSUE_NUMBER)'`

    - [ ] Run `tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs`

      - Make sure you have `requests` installed (e.g., `apt install python3-requests`)

      - The first time you run this script you will need to generate an access token; the script will guide you

    - [ ] Copy the output of the script to the beginning of `ChangeLog-TBB.txt` and update its output

      - [ ] Version

      - [ ] Browser Name

      - [ ] Release Date

    - [ ] Under `All Platforms` include any version updates for:

      - NoScript

      - tor

      - OpenSSL

      - lyrebird

      - Snowflake

    - [ ] Under `Windows + macOS + Linux` include any version updates for:

      - Firefox

    - [ ] Under `Android` include any version updates for:

      - Geckoview

    - [ ] Under `Windows + Android` include any version updates for:

      - zlib

    - [ ] Under `Build System/All Platforms` include any version updates for:

      - Go

  - [ ] Open MR with above changes

      - `$updateArgs` should be these arguments, depending on what you actually updated:

          - [ ] `--firefox` (be sure to include esr at the end if needed, which is usually the case)

          - [ ] `--tor`

          - [ ] `--no-script`

          - [ ] `--openssl`

          - [ ] `--zlib`

          - [ ] `--go`

          - E.g., `tools/fetch-changelogs.py 41028 --date 'December 19 2023' --firefox 115.6.0esr --tor 0.4.8.10 --no-script 11.4.29 --zlib 1.3 --go 1.21.5 --openssl 3.0.12`

        - `--date $date` is optional, if omitted it will be the date on which you run the command

      - [ ] Copy the output of the script to the beginning of `ChangeLog-TBB.txt` and adjust its output

  - [ ] Open MR with above changes, using the template for release preparations

  - [ ] Build the MR after initial review on at least two of:

    - [ ] Tor Project build machine

    - [ ] Mullvad build machine

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

+32 −36
Original line number Diff line number Diff line
@@ -45,8 +45,9 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE 
    - [ ] ***(Optional)*** `var/firefox_platform_version` : update to latest `$(ESR_VERSION)` if rebased

  - [ ] Update `projects/translation/config`:

    - [ ] run `make list_translation_updates-release` to get updated hashes

    - [ ] Update `projects/translation/config`:

      - [ ] run `make list_translation_updates-alpha` to get updated hashes

      - [ ] `steps/base-browser/git_hash` : update with `HEAD` commit of project's `base-browser` branch

    - [ ] `steps/base-browser-fluent/git_hash` : update with `HEAD` commit of project's `basebrowser-newidentityftl` branch

      - [ ] `steps/tor-browser/git_hash` : update with `HEAD` commit of project's `tor-browser` branch

      - [ ] `steps/fenix/git_hash` : update with `HEAD` commit of project's `fenix-torbrowserstringsxml` branch

- [ ] Update Android-specific build configs
@@ -58,10 +59,9 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE 
  - [ ] ***(Optional)*** Update `projects/application-services/config`:

    **NOTE** we don't currently have any of our own patches for this project

    - [ ] `git_hash` : update to appropriate git commit associated with `$(ESR_VERSION)`

  - [ ] ***(Optional)*** Update `projects/android-components/config`:

    - [ ] `android_components_build` : update to match stable android-components tag

  - [ ] ***(Optional)*** Update `projects/fenix/config`

    - [ ] `fenix_build` : update to match fenix tag

  - [ ] ***(Optional)*** Update `projects/firefox-android/config`:

      - [ ] `fenix_version` : update to match alpha `firefox-android` build tag

      - [ ] `browser_branch` : update to match alpha `firefox-android` build tag

  - [ ] Update allowed_addons.json by running (from `tor-browser-build` root):

    - `./tools/fetch_allowed_addons.py > projects/browser/allowed_addons.json`

- [ ] Update common build configs
@@ -79,7 +79,7 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE 
  - [ ] Check for tor updates here : https://gitlab.torproject.org/tpo/core/tor/-/tags

    - [ ] ***(Optional)*** Update `projects/tor/config` 

      - [ ] `version` : update to latest non `-alpha` tag (ping dgoulet or ahf if unsure)

  - [ ] Check for go updates here : https://golang.org/dl

  - [ ] Check for go updates here : https://go.dev/dl

    - **NOTE** : Tor Browser Stable uses the latest of the *previous* Stable major series go version (apart from the transition phase from Tor Browser Alpha to Stable, in which case Tor Browser Stable may use the latest major series go version)

    - [ ] ***(Optional)*** Update `projects/go/config`

      - [ ] `version` : update go version
@@ -92,30 +92,26 @@ Tor Browser Stable lives in the various `maint-$(TOR_BROWSER_MAJOR).$(TOR_BROWSE 
      - [ ] Update `projects/manual/config`:

        - [ ] Change the `version` to `$PIPELINEID`

        - [ ] Update `sha256sum` in the `input_files` section

- [ ] Update `ChangeLog.txt`

  - [ ] Ensure ChangeLog.txt is sync'd between alpha and stable branches

- [ ] Update `ChangeLog-TBB.txt`

  - [ ] Ensure `ChangeLog-TBB.txt` is sync'd between alpha and stable branches

  - [ ] Check the linked issues: ask people to check if any are missing, remove the not fixed ones

  - [ ] Run `tools/fetch-changelogs.py $(TOR_BROWSER_VERSION)` or `tools/fetch-changelogs.py '#$(ISSUE_NUMBER)'`

  - [ ] Run `tools/fetch-changelogs.py $(ISSUE_NUMBER) --date $date $updateArgs`

    - Make sure you have `requests` installed (e.g., `apt install python3-requests`)

    - The first time you run this script you will need to generate an access token; the script will guide you

  - [ ] Copy the output of the script to the beginning of `ChangeLog.txt` and adjust its output

    - **NOTE** : If you used the issue number, you will need to write the Tor Browser version manually

  - [ ] ***(Optional)*** Under `All Platforms` include any version updates for:

    - [ ] Translations

    - [ ] OpenSSL

    - [ ] NoScript

    - [ ] zlib

    - [ ] tor daemon

  - [ ] ***(Optional)*** Under `Windows + macOS + Linux` include updates for:

    - [ ] Firefox

  - [ ] ***(Optional)*** Under `Android`, include updates for:

    - [ ] Geckoview

  - [ ] ***(Optional)*** Under `Build System/All Platforms` include updates for:

    - [ ] Go

- [ ] Open MR with above changes

    - `$updateArgs` should be these arguments, depending on what you actually updated:

      - [ ] `--firefox` (be sure to include esr at the end if needed, which is usually the case)

      - [ ] `--tor`

      - [ ] `--no-script`

      - [ ] `--openssl`

      - [ ] `--zlib`

      - [ ] `--go`

      - E.g., `tools/fetch-changelogs.py 41028 --date 'December 19 2023' --firefox 115.6.0esr --tor 0.4.8.10 --no-script 11.4.29 --zlib 1.3 --go 1.21.5 --openssl 3.0.12`

    - `--date $date` is optional, if omitted it will be the date on which you run the command

  - [ ] Copy the output of the script to the beginning of `ChangeLog-TBB.txt` and adjust its output

- [ ] Open MR with above changes, using the template for release preparations

- [ ] Merge

- [ ] Sign/Tag commit: `make torbrowser-signtag-release`

- [ ] Push tag to `origin`

- [ ] Push tag to `upstream`

- [ ] Begin build on `$(BUILD_SERVER)` (fix any issues in subsequent MRs)

- [ ] **TODO** Submit build-tag to Mullvad build infra

- [ ] Ensure builders have matching builds

.gitlab/merge_request_templates/default.md

+3 −3
Original line number Diff line number Diff line
@@ -43,13 +43,13 @@ 
  - **localization** : henry, pierov

  - **macos** : clairehurst, dan

  - **nightly builds** : boklm

  - **rebases/release-prep** : dan, ma1, pierov, richard

  - **rebases/release-prep** : boklm, dan, ma1, pierov, richard

  - **security** : ma1

  - **signing** : boklm, richard

  - **updater** : pierov

  - **misc/other** : pierov, richard



#### Change Description

### Change Description



<!-- Whatever context the reviewer needs to effectively review the patchset; if the patch includes UX updates be sure to include screenshots/video of how any new behaviour -->