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

Commits:

2 changed files:

Changes:

  • tools/signing/staticiforme-prepare-cdn-dist-upload
    ... ... @@ -28,7 +28,7 @@ chmod 775 "$dist_dir"
    28 28
     chmod 664 "$dist_dir"/*
    
    29 29
     chmod 664 "$dist_dir/.htaccess"
    
    30 30
     
    
    31
    -if is_project torbrowser; then
    
    31
    +if is_project torbrowser && ls "$dist_dir"/*.mar > /dev/null 2>&1; then
    
    32 32
       cdn_dir="/srv/cdn-master.torproject.org/htdocs/aus1/torbrowser/$tbb_version"
    
    33 33
       if test -d "$cdn_dir"
    
    34 34
       then
    

  • tools/signing/wait-for-finished-build
    ... ... @@ -12,9 +12,15 @@ source "$script_dir/functions"
    12 12
     
    
    13 13
     var_is_defined ssh_host_builder builder_tor_browser_build_dir
    
    14 14
     
    
    15
    +platform_desktop=$(rbm_showconf_boolean var/browser_platforms/signing_desktop)
    
    16
    +incrementals=""
    
    17
    +if [[ $platform_desktop == 1 ]]; then
    
    18
    +  incrementals=".incrementals"
    
    19
    +fi
    
    20
    +
    
    15 21
     while true
    
    16 22
     do
    
    17
    -  ssh "$ssh_host_builder" test -f "$builder_tor_browser_build_dir/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-$tbb_version_build/sha256sums-unsigned-build.incrementals.txt" && \
    
    23
    +  ssh "$ssh_host_builder" test -f "$builder_tor_browser_build_dir/$SIGNING_PROJECTNAME/$tbb_version_type/unsigned/$tbb_version-$tbb_version_build/sha256sums-unsigned-build$incrementals.txt" && \
    
    18 24
         exit 0
    
    19 25
       echo "$(date -Iseconds): Waiting for build to finish..."
    
    20 26
       sleep 5m