boklm pushed to branch main at The Tor Project / Applications /
tor-browser-build
Commits:
18e1ee58 by Nicolas Vigier at 2025-07-09T12:34:30+02:00
Bug 41465: Disable development artifacts generation by default
- - - - -
7 changed files:
- projects/browser/build
- projects/browser/build.android
- projects/firefox/build
- projects/geckoview/build
- projects/geckoview/build_apk
- rbm.conf
- rbm.local.conf.example
Changes:
=====================================
projects/browser/build
=====================================
@@ -411,7 +411,7 @@ cd $distdir
popd
[% END %]
-[% IF c("var/nightly") -%]
+[% IF c("var/dev_artifacts") -%]
[% IF c("var/macos_universal") -%]
mkdir -p "$OUTDIR"/artifacts/aarch64
cp -a $rootdir/[% c('input_files_by_name/firefox-aarch64') %]/artifacts/.
"$OUTDIR/artifacts/aarch64"
=====================================
projects/browser/build.android
=====================================
@@ -120,7 +120,7 @@ apksigner sign --verbose --min-sdk-version [%
c("var/android_min_api") %] --ks $
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") -%]
+[% IF c("var/dev_artifacts") -%]
mkdir -p "[% dest_dir %]/[% c('filename') %]/artifacts/"
mv $rootdir/[% c('input_files_by_name/fenix') %]/artifacts[% IF
!c('var/android_single_arch') %]/[% c("var/abi") %][% END %] [% dest_dir %]/[%
c('filename') %]/artifacts
[% END %]
=====================================
projects/firefox/build
=====================================
@@ -123,7 +123,7 @@ echo "Starting ./mach build $(date)"
./mach build stage-package
[% END -%]
-[% IF c("var/nightly") -%]
+[% IF c("var/dev_artifacts") -%]
echo "Building development artifacts"
[% IF c("var/macos") -%]
=====================================
projects/geckoview/build
=====================================
@@ -34,7 +34,7 @@ echo "Starting ./mach configure $(date)"
echo "Starting ./mach build $(date)"
./mach build --verbose
-[% IF c("var/nightly") -%]
+[% IF c("var/dev_artifacts") -%]
echo "Building development artifacts"
./mach package
=====================================
projects/geckoview/build_apk
=====================================
@@ -5,9 +5,8 @@ echo "Starting the creation of the fat AAR $(date)"
tar -C $builddir -xf [% project %]-[% c('version') %].tar.[% c('compress_tar')
%]
-mkdir -p $outdir/[% project %]/artifacts
-[% IF c("var/nightly") -%]
+[% IF c("var/dev_artifacts") -%]
mkdir -p $outdir/[% project %]/artifacts/armeabi-v7a
mv $rootdir/[% c('input_files_by_name/geckoview_armv7') %]/artifacts/*
$outdir/[% project %]/artifacts/armeabi-v7a
mkdir -p $outdir/[% project %]/artifacts/arm64-v8a
=====================================
rbm.conf
=====================================
@@ -285,6 +285,10 @@ var:
- zip
- zstd
+ # Generation of development artifacts is disabled by default. This can
+ # be enabled in rbm.local.conf.
+ dev_artifacts: 0
+
targets:
notarget: linux-x86_64
noint:
=====================================
rbm.local.conf.example
=====================================
@@ -65,6 +65,9 @@ var:
### upload the files to
#tpo_user: username
+ ### This option enables generation of development artifacts
+ #dev_artifacts: '[% c("var/nightly") %]'
+
### The clean configuration is used by the cleaning script to find the
### branches and build targets you are using, to compute the list of
### files that should be kept.
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/18e1ee584775a724b013b90501fc9b82d11cc7cb
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/18e1ee584775a724b013b90501fc9b82d11cc7cb
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tor-commits mailing list -- tor-commits@lists.torproject.org
To unsubscribe send an email to tor-commits-le...@lists.torproject.org
