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

Commits:

4 changed files:

Changes:

  • .gitlab/issue_templates/Release Prep - Tor VPN.md
    ... ... @@ -41,12 +41,7 @@ Tor VPN is on the `main` branch
    41 41 
       - pierov
    42 42 
     - [ ] Ensure all builders have matching builds
    43 43 
     - Place the Tor VPN release to be signed in directory `torvpn/alpha/signed/${TOR_VPN_VERSION}`:
    44 
    -  - [ ] `mkdir torvpn/alpha/signed/${TOR_VPN_VERSION} && cd torvpn/alpha/signed/${TOR_VPN_VERSION}`
    45 
    -  - [ ] `wget https://${URL_PATH}/app-release.aab` (replacing `${URL_PATH}` with the location where the unsigned build has been published)
    46 
    -  - [ ] `mv app-release.aab tor-vpn-${TOR_VPN_VERSION}.aab`
    47 
    -  - [ ] `wget https://${URL_PATH}/app-release-unsigned.apk` (replacing `${URL_PATH}` with the location where the unsigned build has been published)
    48 
    -  - [ ] `mv app-release-unsigned.apk tor-vpn-qa-unsigned-android-multiarch-${TOR_VPN_VERSION}.apk`
    49 
    -  - [ ] `sha256sum tor-vpn-* > sha256sums-unsigned-build.txt`
    44 
    +  - [ ] `./tools/signing/download-torvpn-release.torvpn ${URL_PATH}` (replacing `${URL_PATH}` with the location where the unsigned build has been published, for example https://tb-build-03.torproject.org/~dan/vpn/1.4.0Beta/)
    50 45 
       - [ ] Compare checksums from `sha256sums-unsigned-build.txt` with expected checksums
    51 46 
     - [ ] On `${STAGING_SERVER}`, ensure updated:
    52 47 
       - [ ] `tor-browser-build` is on the right commit

  • rbm.conf
    ... ... @@ -339,9 +339,9 @@ targets:
    339 339 
       torvpn:
    340 340 
         var:
    341 341 
           tor-vpn: 1
    342 
    -      torbrowser_version: '1.3.0Beta'
    342 
    +      torbrowser_version: '1.4.0Beta'
    343 343 
           torbrowser_build: 'build1'
    344 
    -      browser_release_date: '2025/10/31 07:30:00'
    344 
    +      browser_release_date: '2025/12/16 15:00:00'
    345 345 
           project-name: tor-vpn
    346 346 
           projectname: torvpn
    347 347 
           Project_Name: 'Tor VPN'

  • tools/signing/download-torvpn-release.torvpn
    1 
    +#!/bin/bash
    2 
    +#
    3 
    +# This script downloads a Tor VPN release from the given URL and will
    4 
    +# rename the files and put them in torvpn/alpha/signed/$version (where
    5 
    +# $version is the torvpn version defined in rbm.conf).
    6 
    +#
    7 
    +# Usage: download-torvpn-release.torvpn <base_url>
    8 
    +#
    9 
    +# base_url: URL directory where the release can be downloaded. For
    10 
    +# example https://tb-build-03.torproject.org/~dan/vpn/1.4.0Beta/.
    11 
    +#
    12 
    +set -e
    13 
    +script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
    14 
    +source "$script_dir/functions"
    15 
    +
    16 
    +base_url="$1"
    17 
    +
    18 
    +test -d "$signed_version_dir" && \
    19 
    +  exit_error "Directory already exist: $signed_version_dir"
    20 
    +
    21 
    +test $# -ne 1 && \
    22 
    +  exit_error "Wrong number of arguments"
    23 
    +
    24 
    +tmpdir=$(mktemp -p "$script_dir/../../tmp" -d)
    25 
    +trap "rm -Rf $tmpdir" EXIT
    26 
    +cd $tmpdir
    27 
    +for arch in arm64v8a armeabiv7a universal x86 x86_64
    28 
    +do
    29 
    +  case "$arch" in
    30 
    +    arm64v8a)
    31 
    +      dest_arch=aarch64
    32 
    +      ;;
    33 
    +    armeabiv7a)
    34 
    +      dest_arch=armv7
    35 
    +      ;;
    36 
    +    universal)
    37 
    +      dest_arch=multiarch
    38 
    +      ;;
    39 
    +    *)
    40 
    +      dest_arch="$arch"
    41 
    +      ;;
    42 
    +  esac
    43 
    +  dl_filename="app-$arch-release-unsigned.apk"
    44 
    +  wget -O "$dl_filename" "$base_url/$dl_filename"
    45 
    +  mv "$dl_filename" "tor-vpn-qa-unsigned-android-${dest_arch}-${tbb_version}.apk"
    46 
    +done
    47 
    +
    48 
    +wget -O app-universal-release.aab "$base_url/app-universal-release.aab"
    49 
    +mv app-universal-release.aab "tor-vpn-${tbb_version}.aab"
    50 
    +sha256sum $(ls -1 *.apk *.aab | sort) > sha256sums-unsigned-build.txt
    51 
    +cat sha256sums-unsigned-build.txt
    52 
    +
    53 
    +mkdir -p "$signed_version_dir"
    54 
    +mv -f *.aab *.apk *.txt "$signed_version_dir"

  • tools/signing/linux-signer-sign-android-apks
    ... ... @@ -7,7 +7,7 @@ source "$script_dir/functions"
    7 7
    8 8 
     topdir="$script_dir/../.."
    9 9 
     ARCHS="armv7 aarch64 x86_64"
    10 
    -test "$SIGNING_PROJECTNAME" = 'torvpn' && ARCHS='multiarch'
    10 
    +test "$SIGNING_PROJECTNAME" = 'torvpn' && ARCHS="$ARCHS x86 multiarch"
    11 11 
     projname=$(project-name)
    12 12 
     # tbb_version_type, tbb_version and SIGNING_PROJECTNAME are used in
    13 13 
     # wrappers/sign-apk, so we export them

    • —
    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/-/compare/5f158a2f95f4abb1536423f324afe49600ab466b...9ee47407f31b1133f6e67fe09d6169de63e75892 at 1765915989