[tbb-commits] [tor-browser-build/master] Pick up Firefox changes

[gk at torproject.org]

commit 980115dae789978ea0050a50a8c74a9e8f745ebb
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jan 19 07:27:58 2018 +0000

    Pick up Firefox changes
    
    Use tor-browser -2 and build number bump
---
 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 4e42939..04cd7dd 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
   ff_arch: linux-i686
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
diff --git a/projects/firefox/config b/projects/firefox/config
index c433deb..4157500 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-build2'
+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
 gpg_keyring: torbutton.gpg
@@ -28,7 +28,7 @@ targets:
       torbrowser_update_channel: release
 
   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:
       torbrowser_update_channel: default
diff --git a/rbm.conf b/rbm.conf
index abe0547..12b1fd0 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '8.0a1'
-  torbrowser_build: 'build2'
+  torbrowser_build: 'build3'
   torbrowser_incremental_from:
     - 7.5a10
   project_name: tor-browser