[tor-commits] [tor-browser-build/maint-9.0] Picking up 68.8.0esr rc2

[gk at torproject.org]

commit 545e9783a2faf9d577036ddc4f102c5a52dcb467
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Apr 30 06:08:46 2020 +0000

    Picking up 68.8.0esr rc2
---
 projects/firefox-langpacks/config     | 2 +-
 projects/firefox-locale-bundle/config | 2 +-
 projects/firefox/config               | 2 +-
 rbm.conf                              | 2 +-
 4 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-locale-bundle/config b/projects/firefox-locale-bundle/config
index 2f4997f..2ea6db6 100644
--- a/projects/firefox-locale-bundle/config
+++ b/projects/firefox-locale-bundle/config
@@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 var:
   use_container: 0
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build2
diff --git a/projects/firefox/config b/projects/firefox/config
index 75efe0d..9d7c3c2 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
diff --git a/rbm.conf b/rbm.conf
index e23a15b..88a6565 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '9.0.10'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
     - 9.0.9
   project_name: tor-browser