commit 8d5805ae26b873762ec823ae7ec1180d8d89b585 Author: Nicolas Vigier boklm@torproject.org Date: Wed Nov 20 19:14:37 2019 +0100

Bug 32475: Limit the number of mar file locales in nightly builds

We will start supporting updates in the nightly channel only for a limited set of locales. --- projects/tor-browser/build | 18 ++++++++++++++++-- rbm.conf | 6 ++++++ 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/projects/tor-browser/build b/projects/tor-browser/build index 67419a8..0869f50 100644 --- a/projects/tor-browser/build +++ b/projects/tor-browser/build @@ -290,6 +290,17 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/ ELSE; SET browserdir = tbdir _ '/Browser'; END; + SET build_mar = c("var/build_mar"); + # On nightly we only build mar files for some locales + IF c("var/nightly") && c("var/build_mar"); + build_mar = 0; + FOREACH mar_lang = c("var/mar_locales"); + mar_lang = tmpl(mar_lang); + IF mar_lang == lang; + build_mar = 1; + END; + END; + END; %] cat > "$scripts_dir/create-tor-browser_[% lang %]" << SCRIPT_EOF #!/bin/bash @@ -323,8 +334,11 @@ cp $rootdir/[% c('input_files_by_name/firefox') %]/mar-tools-*.zip "$OUTDIR"/

cd $distdir

- # Create full MAR file and compressed package for this locale. - MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "[% browserdir %]" + [% IF build_mar -%] + # Create full MAR file and compressed package for this locale. + MAR=$MARTOOLS/mar MBSDIFF=$MARTOOLS/mbsdiff $MARTOOLS/make_full_update.sh -q $OUTDIR/[% mar_file %] "[% browserdir %]" + [% END -%] + [% IF c("var/linux") %] [% SET tardir = 'tor-browser_' _ lang; c('tar', { diff --git a/rbm.conf b/rbm.conf index f0ae4f9..15d8ef1 100644 --- a/rbm.conf +++ b/rbm.conf @@ -148,6 +148,12 @@ targets: nightly: 1 channel: nightly torbrowser_version: '[% ENV.TORBROWSER_NIGHTLY_VERSION ? ENV.TORBROWSER_NIGHTLY_VERSION : c("var_p/nightly_torbrowser_version") %]' + # For nightly builds, we support updates for a limited set of locales + mar_locales: + - de + - es-ES + - fr + - ru

torbrowser-testbuild: - testbuild