[tor-commits] [tor-browser-build/master] Bug 32788: Specify version for test builds

[gk at torproject.org]

commit 3310abeac20111775407177fb95f4ede3d50251c
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Apr 17 06:46:29 2020 +0000

    Bug 32788: Specify version for test builds
    
    With our switch to including a date into our nightly build versioning
    (#25009) testing patches with test builds got harder. The firefox part
    has to be rebuilt every day now as it includes the version number, even
    if no code changes occurred. That slows down testing of patches
    significantly.
    
    We hardcode "testing" as the test build version number to fix that and
    use "20010101010101" for the build date.
    
    Thanks to boklm for help.
---
 projects/firefox/get-moz-build-date |  4 ++++
 rbm.conf                            | 11 ++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/projects/firefox/get-moz-build-date b/projects/firefox/get-moz-build-date
index e6989ff..a43f2f7 100755
--- a/projects/firefox/get-moz-build-date
+++ b/projects/firefox/get-moz-build-date
@@ -8,6 +8,10 @@ my ($year, $version) = @ARGV;
 my $date;
 if ($version =~ m/^tbb-nightly\.([^\.]+)\.([^\.]+)\.([^\.]+)$/) {
   $date = sprintf("%d%02d%02d010101", $1, $2, $3);
+} elsif ($version eq 'testbuild') {
+  # There is no need for an increasing build date in test builds. Just hardcode
+  # it.
+  $date = 20010101010101;
 } else {
   my @v = split(/[\.ab]/, $version);
   push @v, '0' if @v < 4;
diff --git a/rbm.conf b/rbm.conf
index cd17da9..94f9fcc 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -151,7 +151,16 @@ targets:
     var:
       nightly: 1
       channel: nightly
-      torbrowser_version: '[% ENV.TORBROWSER_NIGHTLY_VERSION ? ENV.TORBROWSER_NIGHTLY_VERSION : c("var_p/nightly_torbrowser_version") %]'
+      torbrowser_version: |
+        [%
+           IF ENV.TORBROWSER_NIGHTLY_VERSION;
+                GET ENV.TORBROWSER_NIGHTLY_VERSION;
+           ELSIF c("var/testbuild");
+                GET "testbuild";
+           ELSE;
+                GET c("var_p/nightly_torbrowser_version");
+           END;
+        -%]
       # For nightly builds, we support updates for a limited set of locales
       mar_locales:
         - de