brizental pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 984f7ff0 by Beatriz Rizental at 2025-05-20T08:30:08+00:00 Bug 41444: Build firefox and geckoview development artifacts - - - - - 5 changed files: - projects/browser/build - projects/browser/build.android - projects/firefox/build - projects/geckoview/build - projects/release/build Changes: ===================================== projects/browser/build ===================================== @@ -428,3 +428,8 @@ cd $distdir [% END -%] popd [% END %] + +[% IF c("var/nightly") -%] + mkdir -p "$OUTDIR"/artifacts + cp -r $rootdir/[% c('input_files_by_name/firefox') %]/artifacts "$OUTDIR" +[% END %] ===================================== projects/browser/build.android ===================================== @@ -119,3 +119,8 @@ apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $ tor_expert_bundle_dest=${tor_expert_bundle_src:0:-7}.tar.gz cp "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz" [% dest_dir %]/[% c('filename') %]/$tor_expert_bundle_dest [% END -%] + +[% IF c("var/nightly") -%] + mkdir -p "$OUTDIR"/artifacts + cp -r $rootdir/geckoview/artifacts "$OUTDIR" +[% END %] ===================================== projects/firefox/build ===================================== @@ -128,6 +128,19 @@ echo "Starting ./mach build $(date)" ./mach build stage-package [% END -%] +[% IF c("var/nightly") -%] + echo "Building development artifacts" + ./mach package + + artifactsdir=[% out_dir %]/artifacts + mkdir $artifactsdir + # Copy the artifacts to the target directory + # Naming convention is the same as Mozilla uses for their artifacts + cp -a obj-*/dist/*.tar.bz2 $artifactsdir/target.tar.bz2 + cp -a obj-*/dist/*.zip $artifactsdir/target.xpt_artifacts.zip + ./mach python -m mozbuild.action.test_archive common $artifactsdir/target.common.tests.tar.gz +[% END %] + [% IF c("var/macos") -%] cp -a obj-*/dist/[% c('var/exe_name') %]/* $distdir [% IF c("var/base-browser") -%] ===================================== projects/geckoview/build ===================================== @@ -34,6 +34,19 @@ echo "Starting ./mach configure $(date)" echo "Starting ./mach build $(date)" ./mach build --verbose +[% IF c("var/nightly") -%] + echo "Building development artifacts" + ./mach package + + artifactsdir=[% dest_dir %]/artifacts + mkdir -p $artifactsdir + # Copy the artifacts to the target directory + # Naming convention is the same as Mozilla uses for their artifacts + cp -a obj-*/dist/*.zip $artifactsdir/target.xpt_artifacts.zip + cp -a obj-*/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/*/geckoview_example-withGeckoBinaries-*.apk $artifactsdir/geckoview_example.apk + ./mach python -m mozbuild.action.test_archive common $artifactsdir/target.common.tests.tar.gz +[% END %] + echo "Build finished, copying the AAR to the to the destination directory $(date)" [% IF !c("var/android_single_arch") -%] ===================================== projects/release/build ===================================== @@ -3,6 +3,7 @@ # reset HOME which was changed by var/set_default_env, for gpg [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]" +rm -rf "$destdir" mkdir -p "$destdir" [% IF c("var/browser_platforms/android-armv7") -%] mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/ @@ -71,7 +72,7 @@ EOF # empty any existing sh256sums file echo -n > sha256sums-unsigned-build.txt # concat sha256sum entry for each file in set -for i in $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk *.bspatch *.json *.deb *.rpm | grep -v '\.incremental\.mar$' | sort) +for i in $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.bz2 *.tar.gz *.apk *.bspatch *.json *.deb *.rpm | grep -v '\.incremental\.mar$' | sort) do sha256sum $i >> sha256sums-unsigned-build.txt done View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/98... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/98... You're receiving this email because of your account on gitlab.torproject.org.