ma1 pushed to branch maint-15.0 at The Tor Project / Applications / tor-browser-build

Commits:

3 changed files:

Changes:

  • .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md
    ... ... @@ -168,6 +168,7 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch
    168 168
         ```
    
    169 169
     
    
    170 170
     ### mullvad-browser (GitHub): https://github.com/mullvad/mullvad-browser/
    
    171
    +This step will send the relevant branches, tags (including a tag named after the release version, e.g. `16.0a1`) and the signed build for QA to Mullvad's github repository.
    
    171 172
     - [ ] Assign this issue to someone with mullvad commit access, one of:
    
    172 173
         - boklm
    
    173 174
         - ma1
    
    ... ... @@ -177,40 +178,10 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch
    177 178
         ```bash
    
    178 179
         cd tor-browser-build/tools/signing/ && ./publish-github.mullvadbrowser
    
    179 180
         ```
    
    180
    -
    
    181 181
     </details>
    
    182 182
     
    
    183 183
     <details>
    
    184 184
       <summary>Communications</summary>
    
    185
    -
    
    186
    -### Mullvad
    
    187
    -- [ ] Email Mullvad with release information:
    
    188
    -  - **Recipients**
    
    189
    -    - Mullvad support alias: support@mullvadvpn.net
    
    190
    -    - Rui Hildt: rui@mullvad.net
    
    191
    -    ```
    
    192
    -    support@mullvadvpn.net, rui@mullvad.net,
    
    193
    -    ```
    
    194
    -  - **Subject**
    
    195
    -    ```
    
    196
    -    New build: Mullvad Browser ${MULLVAD_BROWSER_VERSION} (signed)
    
    197
    -    ```
    
    198
    -  - **Body**
    
    199
    -    ```
    
    200
    -    Hello,
    
    201
    -
    
    202
    -    Branch+Tags have been pushed to Mullvad's GitHub repo.
    
    203
    -
    
    204
    -    - signed builds: https://dist.torproject.org/mullvadbrowser/${MULLVAD_BROWSER_VERSION}
    
    205
    -    - update_response hashes: ${MULLVAD_UPDATE_RESPONSES_HASH}
    
    206
    -
    
    207
    -    * https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-responses
    
    208
    -
    
    209
    -    changelog:
    
    210
    -    # paste changelog as quote here
    
    211
    -    ...
    
    212
    -    ```
    
    213
    -
    
    214 185
     ### packagers
    
    215 186
     - [ ] **(Optional, Once Packages are pushed to GitHub)**
    
    216 187
       - **NOTE**: This is an optional step and only necessary close a major release/transition from alpha to stable, or if there are major packing changes these developers need to be aware of
    

  • .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md
    ... ... @@ -171,6 +171,7 @@ Mullvad Browser Stable is on the `maint-${MULLVAD_BROWSER_MAJOR}.${MULLVAD_BROWS
    171 171
         ```
    
    172 172
     
    
    173 173
     ### mullvad-browser (GitHub): https://github.com/mullvad/mullvad-browser/
    
    174
    +This step will send the relevant branches, tags (including a tag named after the release version, e.g. `15.0`) and the signed build for QA to Mullvad's github repository.
    
    174 175
     - [ ] Assign this issue to someone with mullvad commit access, one of:
    
    175 176
         - boklm
    
    176 177
         - ma1
    
    ... ... @@ -180,40 +181,14 @@ Mullvad Browser Stable is on the `maint-${MULLVAD_BROWSER_MAJOR}.${MULLVAD_BROWS
    180 181
         ```bash
    
    181 182
         cd tor-browser-build/tools/signing/ && ./publish-github.mullvadbrowser
    
    182 183
         ```
    
    183
    -
    
    184
    +  - **NOTE**: if you need the release version tag to be suffixed someway, e.g. because it's a release candidate (`15.0rc1` instead of `15.0`), just add the fix as the first argument of the script:
    
    185
    +     ```bash
    
    186
    +     ./publish-github.mullvadbrowser rc1
    
    187
    +     ```
    
    184 188
     </details>
    
    185 189
     
    
    186 190
     <details>
    
    187 191
       <summary>Communications</summary>
    
    188
    -
    
    189
    -### Mullvad
    
    190
    -- [ ] Email Mullvad with release information:
    
    191
    -  - **Recipients**
    
    192
    -    - Mullvad support alias: support@mullvadvpn.net
    
    193
    -    - Rui Hildt: rui@mullvad.net
    
    194
    -    ```
    
    195
    -    support@mullvadvpn.net, rui@mullvad.net
    
    196
    -    ```
    
    197
    -  - **Subject**
    
    198
    -    ```
    
    199
    -    New build: Mullvad Browser ${MULLVAD_BROWSER_VERSION} (signed)
    
    200
    -    ```
    
    201
    -  - **Body**
    
    202
    -    ```
    
    203
    -    Hello,
    
    204
    -
    
    205
    -    Branch+Tags have been pushed to Mullvad's GitHub repo.
    
    206
    -
    
    207
    -    - signed builds: https://dist.torproject.org/mullvadbrowser/${MULLVAD_BROWSER_VERSION}
    
    208
    -    - update_response hashes: ${MULLVAD_UPDATE_RESPONSES_HASH}*
    
    209
    -
    
    210
    -    * https://gitlab.torproject.org/tpo/applications/mullvad-browser-update-responses
    
    211
    -
    
    212
    -    changelog:
    
    213
    -    # paste changelog as quote here
    
    214
    -    ...
    
    215
    -    ```
    
    216
    -
    
    217 192
     ### packagers
    
    218 193
     - [ ] **(Once Packages are pushed to GitHub)**
    
    219 194
       - **Recipients**
    

  • tools/signing/publish-github.mullvadbrowser
    ... ... @@ -4,6 +4,17 @@ TBB_DIR="$SCRIPT_DIR/../.."
    4 4
     function showconf {
    
    5 5
        "$TBB_DIR/rbm/rbm" showconf $@
    
    6 6
     }
    
    7
    +
    
    8
    +# we may want to add a suffix to the release tag, e.g. rc1
    
    9
    +mbrtag_suffix="$1"
    
    10
    +github_token=$(showconf release buildconf/devmole_auth_token2 2>/dev/null)
    
    11
    +if ! [[ $github_token ]]; then
    
    12
    +  echo >&2 "Github token (buildconf/devmole_auth_token) missing!"
    
    13
    +  exit 1
    
    14
    +fi
    
    15
    +
    
    16
    +set -e
    
    17
    +
    
    7 18
     GL_REMOTE=git@gitlab.torproject.org:tpo/applications/mullvad-browser.git
    
    8 19
     GH_REMOTE=git@github.com:mullvad/mullvad-browser.git
    
    9 20
     CLONE_DIR="$TBB_DIR/git_clones/firefox"
    
    ... ... @@ -13,17 +24,19 @@ MB_TAG=$(showconf firefox git_hash $TARGET)
    13 24
     MB_BRANCH=${MB_TAG//-build[0-9]*/}
    
    14 25
     BB_BRANCH=${MB_BRANCH//mullvad-/base-}
    
    15 26
     ESR_VERSION=$(showconf firefox var/firefox_version $TARGET)
    
    16
    -RELEASE_VERSION=$(showconf release var/torbrowser_version $TARGET)
    
    27
    +BASE_VERSION=$(showconf release var/torbrowser_version $TARGET)
    
    28
    +RELEASE_VERSION="${BASE_VERSION}${mbrtag_suffix}"
    
    17 29
     pushd >/dev/null ../../git_clones/firefox
    
    18 30
     echo "Fetching $MB_BRANCH and tags..."
    
    19 31
     git fetch --tags "$GL_REMOTE" "$MB_BRANCH"
    
    20 32
     BB_TAG=$(git tag -l "$BB_BRANCH-build*" | tail -n1)
    
    21 33
     FX_TAG=$(git tag -l "FIREFOX_${ESR_VERSION//\./_}*" | tail -n1)
    
    34
    +echo "QA build version: $BASE_VERSION"
    
    22 35
     echo "MB tag: $MB_TAG"
    
    23 36
     echo "BB tag: $BB_TAG"
    
    24 37
     echo "FX tag: $FX_TAG"
    
    25 38
     echo "Mullvad release tag: $RELEASE_VERSION"
    
    26
    -read -p "Do you want to tag mullvad $RELEASE_VERSION and push everything to ${GH_REMOTE}? (y/N) " -n 1 -r
    
    39
    +read -p "Do you want to tag mullvad $RELEASE_VERSION and push tags/branches/QA build to ${GH_REMOTE}? (y/N) " -n 1 -r
    
    27 40
     echo
    
    28 41
     if ! [[ $REPLY =~ ^[Yy]$ ]]; then
    
    29 42
        echo >&2 "Operation cancelled"
    
    ... ... @@ -37,3 +50,22 @@ git push "$GH_REMOTE" "$FX_TAG"
    37 50
     git push "$GH_REMOTE" "$BB_TAG"
    
    38 51
     git push "$GH_REMOTE" "$RELEASE_VERSION"
    
    39 52
     popd >/dev/null
    
    53
    +
    
    54
    +# Call Mullvad's github workflow for new releases (mullvad-browser#466)
    
    55
    +
    
    56
    +version=$BASE_VERSION
    
    57
    +response=$(curl -L \
    
    58
    +  -X POST \
    
    59
    +  -H "Accept: application/vnd.github+json" \
    
    60
    +  -H "Authorization: Bearer $github_token" \
    
    61
    +  -H "X-GitHub-Api-Version: 2022-11-28" \
    
    62
    +  "https://api.github.com/repos/mullvad/mullvad-browser/actions/workflows/new_browser_release.yml/dispatches" \
    
    63
    +  -d "{\"ref\":\"main\",\"inputs\":{\"version\":\"$version\"}}")
    
    64
    +
    
    65
    +if ! [ $response ]; then
    
    66
    +  echo "Build $BASE_VERSION submitted."
    
    67
    +else
    
    68
    +  echo >&2 "Something went wrong with build submission:"
    
    69
    +  echo >&2 $response
    
    70
    +  exit 3
    
    71
    +fi