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


Commits:
04fdae04 by hackademix at 2025-10-16T18:48:23+02:00
Bug 41605: Ignore incrementals if we're not building desktop.

- - - - -


2 changed files:

- tools/signing/staticiforme-prepare-cdn-dist-upload
- tools/signing/wait-for-finished-build


Changes:

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


=====================================
tools/signing/wait-for-finished-build
=====================================
@@ -12,9 +12,15 @@ source "$script_dir/functions"
 
 var_is_defined ssh_host_builder builder_tor_browser_build_dir
 
+platform_desktop=$(rbm_showconf_boolean var/browser_platforms/signing_desktop)
+incrementals=""
+if [[ $platform_desktop == 1 ]]; then
+  incrementals=".incrementals"
+fi
+
 while true
 do
-  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"
 && \
+  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"
 && \
     exit 0
   echo "$(date -Iseconds): Waiting for build to finish..."
   sleep 5m



View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/04fdae04e931dec7b20aa1def45704b74a2d5eca

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/04fdae04e931dec7b20aa1def45704b74a2d5eca
You're receiving this email because of your account on gitlab.torproject.org.


_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to