Pier Angelo Vendrame pushed to branch maint-13.0 at The Tor Project / Applications / tor-browser-build
Commits:
-
744d13bf
by Dan Ballard at 2023-12-05T08:46:28+01:00
-
bfc545e4
by Pier Angelo Vendrame at 2023-12-05T08:46:45+01:00
4 changed files:
Changes:
| ... | ... | @@ -668,12 +668,28 @@ cargo_vendor-rcodesign: submodule-update |
| 668 | 668 | submodule-update:
|
| 669 | 669 | git submodule update --init
|
| 670 | 670 | |
| 671 | +# requires tpo_user variable be set in rbm.local.conf
|
|
| 672 | +torbrowser-upload-sha256sums-release: submodule-update
|
|
| 673 | + $(rbm) build release --step upload_sha256sums --target release --target torbrowser
|
|
| 674 | + |
|
| 675 | +# requires tpo_user variable be set in rbm.local.conf
|
|
| 676 | +torbrowser-upload-sha256sums-alpha: submodule-update
|
|
| 677 | + $(rbm) build release --step upload_sha256sums --target alpha --target torbrowser
|
|
| 678 | + |
|
| 671 | 679 | torbrowser-signtag-release: submodule-update
|
| 672 | 680 | $(rbm) build release --step signtag --target release --target torbrowser
|
| 673 | 681 | |
| 674 | 682 | torbrowser-signtag-alpha: submodule-update
|
| 675 | 683 | $(rbm) build release --step signtag --target alpha --target torbrowser
|
| 676 | 684 | |
| 685 | +# requires tpo_user variable be set in rbm.local.conf
|
|
| 686 | +mullvadbrowser-upload-sha256sums-release: submodule-update
|
|
| 687 | + $(rbm) build release --step upload_sha256sums --target release --target mullvadbrowser
|
|
| 688 | + |
|
| 689 | +# requires tpo_user variable be set in rbm.local.conf
|
|
| 690 | +mullvadbrowser-upload-sha256sums-alpha: submodule-update
|
|
| 691 | + $(rbm) build release --step upload_sha256sums --target alpha --target mullvadbrowser
|
|
| 692 | + |
|
| 677 | 693 | mullvadbrowser-signtag-release: submodule-update
|
| 678 | 694 | $(rbm) build release --step signtag --target release --target mullvadbrowser
|
| 679 | 695 |
| ... | ... | @@ -258,6 +258,11 @@ steps: |
| 258 | 258 | debug: 0
|
| 259 | 259 | input_files: []
|
| 260 | 260 | dmg2mar: '[% INCLUDE dmg2mar %]'
|
| 261 | + upload_sha256sums:
|
|
| 262 | + build_log: '-'
|
|
| 263 | + debug: 0
|
|
| 264 | + input_files: []
|
|
| 265 | + upload_sha256sums: '[% INCLUDE upload_sha256sums %]'
|
|
| 261 | 266 | compare_windows_signed_unsigned_exe:
|
| 262 | 267 | build_log: '-'
|
| 263 | 268 | debug: 0
|
| 1 | +#!/bin/sh
|
|
| 2 | +# Tool to sign sha256sums of builds and upload them to where signing/download-unsigned-sha256sums-gpg-signatures-from-people-tpo expects them to be
|
|
| 3 | + |
|
| 4 | +version=[% c("version") %]-[% c("var/torbrowser_build") %]
|
|
| 5 | +signed=[% c("var/signed_status") %]
|
|
| 6 | +channel=[% c("var/build_target") %]
|
|
| 7 | +browser=[% c("var/browser_type") %]
|
|
| 8 | + |
|
| 9 | +src_dir=[% shell_quote(path(dest_dir)) %]/$signed/$version
|
|
| 10 | + |
|
| 11 | +target_dir=public_html/builds/$browser/$channel/$version/
|
|
| 12 | + |
|
| 13 | +echo "browser:$browser channel:$channel signed:$signed version:$version"
|
|
| 14 | + |
|
| 15 | +if [ ! -d $src_dir ]; then
|
|
| 16 | + echo "ERROR: $src_dir does not exist!"
|
|
| 17 | + exit
|
|
| 18 | +fi
|
|
| 19 | + |
|
| 20 | +cd $src_dir
|
|
| 21 | +for i in sha256sums*.txt; do
|
|
| 22 | + if [ ! -f $i.asc ] ; then
|
|
| 23 | + gpg -abs [% c("var/sign_build_gpg_opts") %] $i;
|
|
| 24 | + fi
|
|
| 25 | +done
|
|
| 26 | + |
|
| 27 | +if [ -z '[% c("var/tpo_user") %]' ]; then
|
|
| 28 | + print "tpo_user variable unset, required to upload to people.torproject.org. Please set in rbm.local.conf"
|
|
| 29 | + exit
|
|
| 30 | +fi
|
|
| 31 | + |
|
| 32 | +ssh [% c("var/tpo_user") %]@people.torproject.org "mkdir -p $target_dir"
|
|
| 33 | +rsync sha256sums*.* [% c("var/tpo_user") %]@people.torproject.org:$target_dir
|
|
| 34 | +echo "Synced sha256sums to https://people.torproject.org/~[% c("var/tpo_user") %]/builds/$browser/$channel/$version/" |
| ... | ... | @@ -55,6 +55,11 @@ var: |
| 55 | 55 | ### and sha256sums-unsigned-build.incrementals.txt files.
|
| 56 | 56 | #sign_build_gpg_opts: '--local-user XXXXXXXX'
|
| 57 | 57 | |
| 58 | + ### The var/tpo_user option is used on the release upload_sha256sums step
|
|
| 59 | + ### and is the user on people.torproject.org that ssh/rsync will try to
|
|
| 60 | + ### upload the files to
|
|
| 61 | + #tpo_user: username
|
|
| 62 | + |
|
| 58 | 63 | ### The clean configuration is used by the cleaning script to find the
|
| 59 | 64 | ### branches and build targets you are using, to compute the list of
|
| 60 | 65 | ### files that should be kept.
|