Commit dccd3115 authored by boklm's avatar boklm Committed by Richard Pospesel
Browse files

Bug 40836: Deploy mullvad-browser installer bins to dist.torproject.org

parent 0c27c294

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

+7 −3
Original line number Diff line number Diff line
@@ -88,12 +88,16 @@ Mullvad Browser Stable lives in the various `maint-$(MULLVAD_BROWSER_MAJOR).$(MU 
- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, run the macOS proxy script:

    - `cd tor-browser-build/tools/signing/`

    - `./macos-signer-proxy`

- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure mullvad daemon is running with SOCKS5 proxy on the default port 9050

- [ ] apk signing : copy signed `*multi.apk` files to the unsigned build outputs direcmullvady

- [ ] On `$(STAGING_SERVER)` in a separate `screen` session, ensure tor daemon is running with SOCKS5 proxy on the default port 9050

- [ ] run do-all-signing script:

    - `cd tor-browser-build/tools/signing/`

    - `./do-all-signing.sh`

- **NOTE**: at this point the signed binaries should be in `tor-browser-build/mullvadbrowser/release/signed/$(MULLVAD_BROWSER_VERSION)`

- **NOTE**: at this point the signed binaries should have been copied to `staticiforme`

- [ ] Update `staticiforme.torproject.org`:

  - From `screen` session on `staticiforme.torproject.org`:

  - [ ] Static update components : `static-update-component dist.torproject.org`

  - [ ] Remove old release data from `/srv/dist-master.torproject.org/htdocs/mullvadbrowser`

  - [ ] Static update components (again) : `static-update-component dist.torproject.org`



</details>

tools/signing/do-all-signing

+3 −6
Original line number Diff line number Diff line
@@ -227,11 +227,8 @@ do_step sync-after-hash 
do_step linux-signer-gpg-sign

do_step sync-after-gpg-sign

do_step download-unsigned-sha256sums-gpg-signatures-from-people-tpo

is_project torbrowser && \

do_step sync-local-to-staticiforme

is_project torbrowser && \

do_step sync-scripts-to-staticiforme

is_project torbrowser && \

do_step staticiforme-prepare-cdn-dist-upload

do_step upload-update_responses-to-staticiforme

do_step finished-signing-clean-macos-signer

tools/signing/staticiforme-prepare-cdn-dist-upload

+22 −14
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ chmod 775 "$dist_dir" 
chmod 664 "$dist_dir"/*

chmod 664 "$dist_dir/.htaccess"



if is_project torbrowser; then

  cdn_dir="/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser/$tbb_version"

  if test -d "$cdn_dir"

  then
@@ -30,7 +31,14 @@ for marfile in "$dist_dir"/*.mar; do 
    ln -f "$marfile" .

  done



echo "$tbb_version is ready to upload to cdn.tpo and dist.tpo"

  dest='cdn.tpo and dist.tpo'

  staticupdatecmd='static-update-component cdn.torproject.org && static-update-component dist.torproject.org'

else

  dest='dist.tpo'

  staticupdatecmd='static-update-component dist.torproject.org'

fi



echo "$tbb_version is ready to upload to $dest"

echo "You should remove the old version(s) before starting the upload with:"

echo '  static-update-component cdn.torproject.org && static-update-component dist.torproject.org'

echo "  $staticupdatecmd"

echo '(preferably using screen or tmux)'

tools/signing/sync-local-to-staticiforme

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ set -e 
script_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

source "$script_dir/functions"



rsync $rsync_options "$signed_version_dir/" "$ssh_host_staticiforme:/srv/dist-master.torproject.org/htdocs/torbrowser/$tbb_version/"
 
rsync $rsync_options "$signed_version_dir/" "$ssh_host_staticiforme:/srv/dist-master.torproject.org/htdocs/$SIGNING_PROJECTNAME/$tbb_version/"