[tor-commits] [tor-browser-build/master] Bug 24879: enable fetching of new commits by default for nightly builds

[gk at torproject.org]

commit 95b5c738d8e1a11596e652363e801e500c5733de
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Mon Jan 15 19:26:28 2018 +0100

    Bug 24879: enable fetching of new commits by default for nightly builds
---
 README                 |  3 ++-
 rbm.conf               |  1 +
 rbm.local.conf.example | 13 +++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/README b/README
index a449f9d..d498c05 100644
--- a/README
+++ b/README
@@ -89,7 +89,8 @@ Updating git sources
 
 You can run "make fetch" to fetch the latest sources from git for all
 components included in Tor Browser. You should run this if you want to
-make a nightly build with the latest commits.
+make a nightly build with the latest commits, and you disabled automatic
+fetching of new commits for nightly builds in rbm.local.conf.
 
 
 Number of make processes
diff --git a/rbm.conf b/rbm.conf
index 76b7627..b1ad4c4 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -112,6 +112,7 @@ targets:
       alpha: 1
       channel: alpha
   nightly:
+    fetch: 1
     var:
       nightly: 1
       channel: nightly
diff --git a/rbm.local.conf.example b/rbm.local.conf.example
index a6401a9..916cb5e 100644
--- a/rbm.local.conf.example
+++ b/rbm.local.conf.example
@@ -96,4 +96,17 @@ targets:
       ### Uncomment this if you want to create mar files in your test build.
       #build_mar: 1
 
+  nightly:
+
+    ### By default 'fetch' is set to 1 for nightly builds, meaning that new
+    ### commits will be fetched automatically during each build. You can
+    ### disable this during developement if you want to do rebuilds to test
+    ### a specific change, but don't want rebuilds caused by unrelated
+    ### changes, or if you want to decide at which point new commits are
+    ### fetched. When 'fetch' is set to 'if_needed', new commits will only
+    ### be fetched if the selected commit (or branch, or tag) is not present,
+    ### which means that existing branches won't be updated. In that case
+    ### you can fetch new commits by running 'make fetch'.
+    #fetch: 'if_needed'
+
 # vim: filetype=yaml sw=2