[tbb-commits] [tor-browser-build/maint-10.0-desktop] Pick up Firefox's build2

[sysrqb at torproject.org]

commit 24786d3dc04e3776a91570cf723218c19d059dde
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Wed Jan 20 21:58:24 2021 +0000

    Pick up Firefox's build2
---
 projects/firefox-langpacks/config | 2 +-
 projects/firefox/config           | 4 ++--
 rbm.conf                          | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 34d6fad..17a707a 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build2
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
 targets:
diff --git a/projects/firefox/config b/projects/firefox/config
index f0ea1f4..1ffe7b0 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
@@ -49,7 +49,7 @@ targets:
       branding_directory: 'browser/branding/official'
 
   nightly:
-    git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1'
+    git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2'
     tag_gpg_id: 0
     var:
       branding_directory: 'browser/branding/nightly'
diff --git a/rbm.conf b/rbm.conf
index bb94119..776ddbe 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '10.0.9'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
     - 10.0.7
     - 10.0.8