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
5 changed files:
- projects/browser/build
- projects/browser/build.android
- projects/firefox/build
- projects/geckoview/build
- projects/release/build
Changes:
| ... | ... | @@ -428,3 +428,8 @@ cd $distdir |
| 428 | 428 | [% END -%]
|
| 429 | 429 | popd
|
| 430 | 430 | [% END %]
|
| 431 | + |
|
| 432 | +[% IF c("var/nightly") -%]
|
|
| 433 | + mkdir -p "$OUTDIR"/artifacts
|
|
| 434 | + cp -r $rootdir/[% c('input_files_by_name/firefox') %]/artifacts "$OUTDIR"
|
|
| 435 | +[% END %] |
| ... | ... | @@ -119,3 +119,8 @@ apksigner sign --verbose --min-sdk-version [% c("var/android_min_api") %] --ks $ |
| 119 | 119 | tor_expert_bundle_dest=${tor_expert_bundle_src:0:-7}.tar.gz
|
| 120 | 120 | cp "$rootdir/[% c("input_files_by_name/tor-expert-bundle") %]/tor-expert-bundle.tar.gz" [% dest_dir %]/[% c('filename') %]/$tor_expert_bundle_dest
|
| 121 | 121 | [% END -%]
|
| 122 | + |
|
| 123 | +[% IF c("var/nightly") -%]
|
|
| 124 | + mkdir -p "$OUTDIR"/artifacts
|
|
| 125 | + cp -r $rootdir/geckoview/artifacts "$OUTDIR"
|
|
| 126 | +[% END %] |
| ... | ... | @@ -128,6 +128,19 @@ echo "Starting ./mach build $(date)" |
| 128 | 128 | ./mach build stage-package
|
| 129 | 129 | [% END -%]
|
| 130 | 130 | |
| 131 | +[% IF c("var/nightly") -%]
|
|
| 132 | + echo "Building development artifacts"
|
|
| 133 | + ./mach package
|
|
| 134 | + |
|
| 135 | + artifactsdir=[% out_dir %]/artifacts
|
|
| 136 | + mkdir $artifactsdir
|
|
| 137 | + # Copy the artifacts to the target directory
|
|
| 138 | + # Naming convention is the same as Mozilla uses for their artifacts
|
|
| 139 | + cp -a obj-*/dist/*.tar.bz2 $artifactsdir/target.tar.bz2
|
|
| 140 | + cp -a obj-*/dist/*.zip $artifactsdir/target.xpt_artifacts.zip
|
|
| 141 | + ./mach python -m mozbuild.action.test_archive common $artifactsdir/target.common.tests.tar.gz
|
|
| 142 | +[% END %]
|
|
| 143 | + |
|
| 131 | 144 | [% IF c("var/macos") -%]
|
| 132 | 145 | cp -a obj-*/dist/[% c('var/exe_name') %]/* $distdir
|
| 133 | 146 | [% IF c("var/base-browser") -%]
|
| ... | ... | @@ -34,6 +34,19 @@ echo "Starting ./mach configure $(date)" |
| 34 | 34 | echo "Starting ./mach build $(date)"
|
| 35 | 35 | ./mach build --verbose
|
| 36 | 36 | |
| 37 | +[% IF c("var/nightly") -%]
|
|
| 38 | + echo "Building development artifacts"
|
|
| 39 | + ./mach package
|
|
| 40 | + |
|
| 41 | + artifactsdir=[% dest_dir %]/artifacts
|
|
| 42 | + mkdir -p $artifactsdir
|
|
| 43 | + # Copy the artifacts to the target directory
|
|
| 44 | + # Naming convention is the same as Mozilla uses for their artifacts
|
|
| 45 | + cp -a obj-*/dist/*.zip $artifactsdir/target.xpt_artifacts.zip
|
|
| 46 | + cp -a obj-*/gradle/build/mobile/android/geckoview_example/outputs/apk/withGeckoBinaries/*/geckoview_example-withGeckoBinaries-*.apk $artifactsdir/geckoview_example.apk
|
|
| 47 | + ./mach python -m mozbuild.action.test_archive common $artifactsdir/target.common.tests.tar.gz
|
|
| 48 | +[% END %]
|
|
| 49 | + |
|
| 37 | 50 | echo "Build finished, copying the AAR to the to the destination directory $(date)"
|
| 38 | 51 | |
| 39 | 52 | [% IF !c("var/android_single_arch") -%]
|
| ... | ... | @@ -3,6 +3,7 @@ |
| 3 | 3 | # reset HOME which was changed by var/set_default_env, for gpg
|
| 4 | 4 | [% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %]
|
| 5 | 5 | destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]"
|
| 6 | +rm -rf "$destdir"
|
|
| 6 | 7 | mkdir -p "$destdir"
|
| 7 | 8 | [% IF c("var/browser_platforms/android-armv7") -%]
|
| 8 | 9 | mv [% c('input_files_by_name/android-armv7') %]/* "$destdir"/
|
| ... | ... | @@ -71,7 +72,7 @@ EOF |
| 71 | 72 | # empty any existing sh256sums file
|
| 72 | 73 | echo -n > sha256sums-unsigned-build.txt
|
| 73 | 74 | # concat sha256sum entry for each file in set
|
| 74 | -for i in $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip *.tar.gz *.apk *.bspatch *.json *.deb *.rpm | grep -v '\.incremental\.mar$' | sort)
|
|
| 75 | +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)
|
|
| 75 | 76 | do
|
| 76 | 77 | sha256sum $i >> sha256sums-unsigned-build.txt
|
| 77 | 78 | done
|