[tbb-commits] [tor-browser-build/master] Bug 40021: Unbreak our desktop nightly builds

[sysrqb at torproject.org]

commit 4f98b8d75e7f1b3ece131b8b18f01d41e782d6fb
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jul 10 19:09:41 2020 +0000

    Bug 40021: Unbreak our desktop nightly builds
---
 projects/firefox/config      | 2 +-
 projects/tor-launcher/config | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 874d7d2..2ee16e4 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -8,7 +8,7 @@ git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 68.10.1
+  firefox_platform_version: 78.0.1
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 10.0
   branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha'
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index f8a974a..9aaca27 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -22,7 +22,5 @@ steps:
 targets:
   nightly:
     version: '[% c("abbrev") %]'
-    # Hardcode the commit for now so we can start landing ESR 78 patches without
-    # breaking nightly builds.
-    git_hash: b4838d339a84c5ebebd91a0ba6b22d44ecda97b1
+    git_hash: master
     tag_gpg_id: 0