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

Commits:

3 changed files:

Changes:

  • .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md
    ... ... @@ -173,21 +173,10 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch
    173 173
         - ma1
    
    174 174
         - morgan
    
    175 175
         - pierov
    
    176
    -- [ ] Sign+Tag additionally the `mullvad-browser.git` `firefox` commit used in build:
    
    177
    -  - **Tag**: `${MULLVAD_BROWSER_VERSION}`
    
    178
    -    - **example**: `12.5a7`
    
    179
    -  - **Message**: `${ESR_VERSION}esr-based ${MULLVAD_BROWSER_VERSION}`
    
    180
    -    - **example**: `102.12.0esr-based 12.5a7`
    
    181
    -- [ ] Push this release's associated `mullvad-browser.git` branch to github
    
    182
    -- [ ] Push this release's associated tags to github:
    
    183
    -  - [ ] Firefox ESR tag
    
    184
    -    - **example**: `FIREFOX_102_12_0esr_BUILD1`
    
    185
    -  - [ ] `base-browser` tag
    
    186
    -    - **example**: `base-browser-102.12.0esr-12.0-1-build1`
    
    187
    -  - [ ] `mullvad-browser` build tag
    
    188
    -    - **example**: `mullvad-browser-102.12.0esr-12.0-1-build1`
    
    189
    -  - [ ] `mullvad-browser` release tag
    
    190
    -    - **example**: `12.0.11`
    
    176
    +- [ ] Run:
    
    177
    +    ```bash
    
    178
    +    cd tor-browser-build/tools/signing/ && ./publish-github.mullvadbrowser
    
    179
    +    ```
    
    191 180
     
    
    192 181
     </details>
    
    193 182
     
    

  • .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md
    ... ... @@ -176,21 +176,10 @@ Mullvad Browser Stable is on the `maint-${MULLVAD_BROWSER_MAJOR}.${MULLVAD_BROWS
    176 176
         - ma1
    
    177 177
         - morgan
    
    178 178
         - pierov
    
    179
    -- [ ] Sign+Tag additionally the `mullvad-browser.git` `firefox` commit used in build:
    
    180
    -  - **Tag**: `${MULLVAD_BROWSER_VERSION}`
    
    181
    -    - **example**: `12.5a7`
    
    182
    -  - **Message**: `${ESR_VERSION}esr-based ${MULLVAD_BROWSER_VERSION}`
    
    183
    -    - **example**: `102.12.0esr-based 12.5a7`
    
    184
    -- [ ] Push this release's associated `mullvad-browser.git` branch to github
    
    185
    -- [ ] Push this release's associated tags to github:
    
    186
    -  - [ ] Firefox ESR tag
    
    187
    -    - **example**: `FIREFOX_102_12_0esr_BUILD1`
    
    188
    -  - [ ] `base-browser` tag
    
    189
    -    - **example**: `base-browser-102.12.0esr-12.0-1-build1`
    
    190
    -  - [ ] `mullvad-browser` build tag
    
    191
    -    - **example**: `mullvad-browser-102.12.0esr-12.0-1-build1`
    
    192
    -  - [ ] `mullvad-browser` release tag
    
    193
    -    - **example**: `12.0.11`
    
    179
    +- [ ] Run:
    
    180
    +    ```bash
    
    181
    +    cd tor-browser-build/tools/signing/ && ./publish-github.mullvadbrowser
    
    182
    +    ```
    
    194 183
     
    
    195 184
     </details>
    
    196 185
     
    

  • tools/signing/publish-github.mullvadbrowser
    1
    +#!/bin/bash
    
    2
    +SCRIPT_DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
    
    3
    +TBB_DIR="$SCRIPT_DIR/../.."
    
    4
    +function showconf {
    
    5
    +   "$TBB_DIR/rbm/rbm" showconf $@
    
    6
    +}
    
    7
    +GL_REMOTE=git@gitlab.torproject.org:tpo/applications/mullvad-browser.git
    
    8
    +GH_REMOTE=git@github.com:mullvad/mullvad-browser.git
    
    9
    +CLONE_DIR="$TBB_DIR/git_clones/firefox"
    
    10
    +CHANNEL=$(showconf release var/browser_default_channel)
    
    11
    +TARGET="--target $CHANNEL --target mullvadbrowser-linux-x86_64"
    
    12
    +MB_TAG=$(showconf firefox git_hash $TARGET)
    
    13
    +MB_BRANCH=${MB_TAG//-build[0-9]*/}
    
    14
    +BB_BRANCH=${MB_BRANCH//mullvad-/base-}
    
    15
    +ESR_VERSION=$(showconf firefox var/firefox_version $TARGET)
    
    16
    +RELEASE_VERSION=$(showconf release var/torbrowser_version $TARGET)
    
    17
    +pushd >/dev/null ../../git_clones/firefox
    
    18
    +echo "Fetching $MB_BRANCH and tags..."
    
    19
    +git fetch --tags "$GL_REMOTE" "$MB_BRANCH"
    
    20
    +BB_TAG=$(git tag -l "$BB_BRANCH-build*" | tail -n1)
    
    21
    +FX_TAG=$(git tag -l "FIREFOX_${ESR_VERSION//\./_}*" | tail -n1)
    
    22
    +echo "MB tag: $MB_TAG"
    
    23
    +echo "BB tag: $BB_TAG"
    
    24
    +echo "FX tag: $FX_TAG"
    
    25
    +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
    
    27
    +echo
    
    28
    +if ! [[ $REPLY =~ ^[Yy]$ ]]; then
    
    29
    +   echo >&2 "Operation cancelled"
    
    30
    +   exit 1
    
    31
    +fi
    
    32
    +git checkout $MB_TAG
    
    33
    +git tag -s $RELEASE_VERSION -m"$ESR_VERSION-based $RELEASE_VERSION"
    
    34
    +git tag -n1 $RELEASE_VERSION
    
    35
    +git push "$GH_REMOTE" "HEAD:refs/heads/$MB_BRANCH"
    
    36
    +git push "$GH_REMOTE" "$FX_TAG"
    
    37
    +git push "$GH_REMOTE" "$BB_TAG"
    
    38
    +git push "$GH_REMOTE" "$RELEASE_VERSION"
    
    39
    +popd >/dev/null