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

Commits:

2 changed files:

Changes:

  • .gitlab/issue_templates/Release Prep - Tor Browser Legacy.md
    ... ... @@ -246,34 +246,18 @@ popd
    246 246 
         static-update-component cdn.torproject.org && static-update-component dist.torproject.org
    247 247 
         ```
    248 248 
     - [ ] **(Optional)** Generate and deploy new update responses
    249 
    -  - **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.
    249 
    +  - **NOTE**: This is only required if there will be no corresponding 15.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 15.0 release.
    250 250 
       - **⚠️ WARNING**: This is a little bit off the beaten track, ping boklm or morgan if you have any doubts
    251 
    -  - From the `maint-14.5` branch:
    251 
    +  - From the `maint-15.0` branch:
    252 252 
         - [ ] Update `rbm.conf`
    253 253 
           - [ ] `var/torbrowser_legacy_version`: update to `${TOR_BROWSER_VERSION}`
    254 
    -        - **NOTE** this is the browser version for the legacy branch, not the 14.0 branch
    254 
    +        - **NOTE** this is the browser version for the legacy branch, not this stable branch we've switched to
    255 255 
           - [ ] `var/torbrowser_legacy_platform_version`: update to `${ESR_VERSION}`
    256 
    -        - **NOTE** this is ESR version for the legacy branch, not the 14.0 branch
    257 
    -    - [ ] Generate update responses:
    256 
    +        - **NOTE** this is ESR version for the legacy branch, not this stable branch we've switched to
    257 
    +    - [ ] Generate update responses and commit them to tor-browser-update-responses.git:
    258 258 
           - Run:
    259 259 
             ```bash
    260 
    -        make torbrowser-update_responses-release
    261 
    -        ```
    262 
    -    - [ ] Commit new update responses to tor-browser-update-responses.git:
    263 
    -      - Run:
    264 
    -        ```bash
    265 
    -        updaterespdir=/path/to/tor-browser-update-responses.git
    266 
    -        cp torbrowser/release/update-responses/update-responses-release-${TOR_BROWSER_VERSION}.tar "$updaterespdir"
    267 
    -        cd "$updaterespdir"
    268 
    -        git pull
    269 
    -        rm -Rf update_3/release
    270 
    -        tar -C update_3 update-responses-release-${TOR_BROWSER_VERSION}.tar
    271 
    -        rm update-responses-release-${TOR_BROWSER_VERSION}.tar
    272 
    -        git add update_3/release
    273 
    -        git commit -m "release: new version, ${TOR_BROWSER_VERSION}"
    274 
    -        git push
    275 
    -        # print the commit hash and copy past it for the next step
    276 
    -        git show -s --format=%H
    260 
    +        cd tor-browser-build/tools/signing/ && ./deploy-legacy
    277 261 
             ```
    278 262 
       - On `staticiforme.torproject.org`, deploy new update responses:
    279 263 
         - [ ] Enable update responses, passing the commit hash as argument (replace $commit):

  • tools/signing/deploy-legacy
    1 
    +#!/bin/bash
    2 
    +set -e
    3 
    +SIGNING_PROJECTNAME=torbrowser
    4 
    +script_dir=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
    5 
    +TBB_DIR="$script_dir/../.."
    6 
    +source "$script_dir/functions"
    7 
    +source "$script_dir/set-config.update-responses"
    8 
    +TOR_BROWSER_VERSION=$(rbm_showconf var/torbrowser_version)
    9 
    +TOR_BROWSER_LEGACY_VERSION=$(rbm_showconf var/torbrowser_legacy_version)
    10 
    +ESR_LEGACY_VERSION=$(rbm_showconf var/torbrowser_legacy_platform_version)
    11 
    +echo "TOR_BROWSER_VERSION ${TOR_BROWSER_VERSION}"
    12 
    +echo "TOR_BROWSER_LEGACY_VERSION ${TOR_BROWSER_LEGACY_VERSION}"
    13 
    +echo "ESR_LEGACY_VERSION: ${ESR_LEGACY_VERSION}"
    14 
    +read -p "Continue with update response for these versions (y/N) " -n 1 -r
    15 
    +
    16 
    +echo
    17 
    +if ! [[ $REPLY =~ ^[Yy]$ ]]; then
    18 
    +   echo >&2 "Operation cancelled"
    19 
    +   exit 1
    20 
    +fi
    21 
    +
    22 
    +pushd "$TBB_DIR"
    23 
    +
    24 
    +"tools/download-torbrowser ${TOR_BROWSER_VERSION}"
    25 
    +make torbrowser-update_responses-release
    26 
    +
    27 
    +cp torbrowser/release/update-responses/update-responses-release-${TOR_BROWSER_VERSION}.tar "$update_responses_repository_dir"
    28 
    +
    29 
    +popd
    30 
    +
    31 
    +pushd "$update_responses_repository_dir"
    32 
    +git pull
    33 
    +rm -Rf update_3/release
    34 
    +tar -C update_3 -xf update-responses-release-${TOR_BROWSER_VERSION}.tar
    35 
    +rm update-responses-release-${TOR_BROWSER_VERSION}.tar
    36 
    +git add update_3/release
    37 
    +git commit -m "release: new version, ${TOR_BROWSER_LEGACY_VERSION}"
    38 
    +git push
    39 
    +
    40 
    +echo "Update responses commit, for you to review:"
    41 
    +git show
    42 
    +
    43 
    +commit=$(git show -s --format=%H)
    44 
    +echo
    45 
    +echo "On staticiforme.torproject.org now deploy new update responses:"
    46 
    +echo "sudo -u tb-release ./deploy_update_responses-release.sh $commit"
    47 
    +
    48 
    +popd

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications · Help Notification message regarding https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/b8180152e8e8bb6846c0111f6a0f3629bdf3d278 at 1761661775