boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: f62b1a5e by Nicolas Vigier at 2026-05-20T10:49:35+02:00 Bug 41686: Copy more build artifacts to the artifacts directory - - - - - 3 changed files: - projects/browser/build - projects/browser/build.android - projects/geckoview/build Changes: ===================================== projects/browser/build ===================================== @@ -68,7 +68,7 @@ done MARTOOLS=$rootdir/mar-tools [% END -%] -mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" +cp -a [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" [% IF c("var/mullvad-browser") -%] mv [% c('input_files_by_name/ublock-origin') %] "$TBDIR/$EXTSPATH/uBlock0@raymondhill.net.xpi" mv [% c('input_files_by_name/mullvad-extension') %] "$TBDIR/$EXTSPATH/{d19a89b9-76c1-4a61-bcd4-49e8de916403}.xpi" @@ -413,4 +413,20 @@ cd $distdir cp -a $rootdir/[% c('input_files_by_name/firefox-aarch64') %]/artifacts "$OUTDIR" [% END -%] cp -a $rootdir/[% c('input_files_by_name/firefox') %]/artifacts "$OUTDIR" + [% + SET artifacts_archs = [ c("var/osname") ]; + IF c("var/macos_universal"); + SET artifacts_archs = [ 'macos-aarch64', 'macos-x86_64' ]; + END; + + FOREACH artifacts_arch = artifacts_archs; + SET arch_ext = artifacts_arch == 'macos-aarch64' ? '-aarch64' : ''; + %] + cp -a $rootdir/[% c('input_files_by_name/noscript') %] \ + $rootdir/[% c('input_files_by_name/fonts') %] \ + [% IF c("var/tor-browser") -%] + $rootdir/[% c('input_files_by_name/tor-expert-bundle' _ arch_ext) %]/tor-expert-bundle.tar.gz \ + [% END -%] + "$OUTDIR/artifacts/[% artifacts_arch %]/" + [% END %] [% END %] ===================================== projects/browser/build.android ===================================== @@ -133,7 +133,11 @@ apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $ [% END -%] [% IF c("var/dev_artifacts") -%] - mkdir -p "[% dest_dir %]/[% c('filename') %]/artifacts/android-[% c('var/abi') %]" + artifacts_dir="[% dest_dir %]/[% c('filename') %]/artifacts/android-[% c('var/abi') %]" + mkdir -p "$artifacts_dir" mv $rootdir/[% c('input_files_by_name/fenix') %]/geckoview/artifacts/[% c('var/abi') %]/* \ - "[% dest_dir %]/[% c('filename') %]/artifacts/android-[% c('var/abi') %]" + [% IF c("var/tor-browser") -%] + "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz" \ + [% END -%] + "$artifacts_dir" [% END %] ===================================== projects/geckoview/build ===================================== @@ -40,6 +40,12 @@ echo "Starting ./mach build $(date)" ./mach python -m mozbuild.action.test_archive mozharness mozharness.zip mv mozharness.zip $artifactsdir + + cp -a \ + [% IF !c("var/firefox-browser") %]$rootdir/[% c('input_files_by_name/application-services') %][% END %] \ + $rootdir/[% c('input_files_by_name/cbindgen') %] \ + $rootdir/[% c('input_files_by_name/node') %] \ + $artifactsdir [% END %] echo "Build finished, copying the AAR to the to the destination directory $(date)" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f6... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/f6... You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help