Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 24cdd7e4 by Pier Angelo Vendrame at 2025-12-02T20:55:23+01:00 Bug 41647: Use multi-threaded xz compression. - - - - - 2 changed files: - projects/firefox/build - rbm.conf Changes: ===================================== projects/firefox/build ===================================== @@ -129,14 +129,6 @@ echo "Starting ./mach build $(date)" export MOZ_PKG_MAC_ICON=$rootdir/dmg-root/[% c('var/ProjectName') %].dmg/.VolumeIcon.icns [% END -%] - [% IF c("var/linux") -%] - # Compression differs with 1 or 2+ threads, - # so we'll want to have at least 2 threads, but otherwise respect num_procs. - # - # Without this, compression takes 20min+ - export XZ_DEFAULTS="-T[% c("num_procs") > 1 ? c("num_procs") : '2' %]" - [% END -%] - # Package the browser and also create all the test artifacts. # # MOZ_SIMPLE_PACKAGE_NAME will force all artifact files to start with "target", ===================================== rbm.conf ===================================== @@ -261,9 +261,11 @@ var: [% IF c("container/global_disable") -%] rm -Rf /var/tmp/build /var/tmp/dist [% END -%] + # Single vs multi-threaded might produce different results, so force at + # least two threads for reproducibility purposes. + export XZ_DEFAULTS="-T[% c("num_procs") > 1 ? c("num_procs") : '2' %]" [% IF c("compress_tar") == 'zst' -%] - # Always set ZSTD_NBTHREADS > 1 to make archives reproducible - # (single vs multi-threaded might produce different results) + # Same as xz. export ZSTD_NBTHREADS=[% c("num_procs") > 1 ? c("num_procs") : '2' %] [% END -%] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/24... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/24... You're receiving this email because of your account on gitlab.torproject.org.