Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
authorMozilla Releng Treescript <release+treescript@mozilla.org>
Mon, 01 Jun 2020 09:38:04 +0000
changeset 596913 3e7c70a1e4a194a6b1a1a2024d06c7ca6bec72f5
parent 596912 370ca6638017cf82cd697e30ed24030702122f41
child 596914 3a0b727477b6144f464aa4005591adbdc436f822
push id13186
push userffxbld-merge
push dateMon, 01 Jun 2020 09:52:46 +0000
treeherdermozilla-beta@3e7c70a1e4a1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrelease
milestone78.0
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
CLOBBER
browser/config/mozconfigs/linux32/l10n-mozconfig
browser/config/mozconfigs/linux64/l10n-mozconfig
browser/config/mozconfigs/macosx64/l10n-mozconfig
browser/config/mozconfigs/win32/l10n-mozconfig
browser/config/mozconfigs/win64-aarch64/l10n-mozconfig
browser/config/mozconfigs/win64/l10n-mozconfig
browser/config/version.txt
browser/config/version_display.txt
build/mozconfig.common
config/milestone.txt
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Bug 1636389 - Moved a file in NSS, causing stale build state
+Merge day clobber
\ No newline at end of file
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,10 +1,10 @@
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-branding=browser/branding/nightly
+ac_add_options --enable-official-branding
 ac_add_options --disable-nodejs
 
 . "$topsrcdir/build/mozconfig.no-compile"
 
 if test `uname -m` = "x86_64"; then
   ac_add_options --target=i686-pc-linux
   ac_add_options --host=i686-pc-linux
 fi
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,10 +1,10 @@
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-branding=browser/branding/nightly
+ac_add_options --enable-official-branding
 
 . "$topsrcdir/build/mozconfig.no-compile"
 ac_add_options --disable-nodejs
 
 export MOZILLA_OFFICIAL=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@@ -5,17 +5,17 @@ if test `uname -s` = "Linux"; then
   # We need to indicate the target for cross builds
   ac_add_options --target=x86_64-apple-darwin
   export MKFSHFS=$MOZ_FETCHES_DIR/hfsplus-tools/newfs_hfs
   export DMG_TOOL=$MOZ_FETCHES_DIR/dmg/dmg
   export HFS_TOOL=$MOZ_FETCHES_DIR/dmg/hfsplus
 fi
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-branding=browser/branding/nightly
+ac_add_options --enable-official-branding
 
 ac_add_options --disable-nodejs
 unset NODEJS
 
 export MOZILLA_OFFICIAL=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig
@@ -1,15 +1,15 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --target=i686-pc-mingw32
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-branding=browser/branding/nightly
+ac_add_options --enable-official-branding
 
 ac_add_options --disable-nodejs
 unset NODEJS
 
 export MOZILLA_OFFICIAL=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
--- a/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig
+++ b/browser/config/mozconfigs/win64-aarch64/l10n-mozconfig
@@ -1,14 +1,14 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/browser/config/mozconfigs/win64-aarch64/common-win64"
 . "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
-ac_add_options --with-branding=browser/branding/nightly
+ac_add_options --enable-official-branding
 
 ac_add_options --disable-nodejs
 unset NODEJS
 
 export MOZILLA_OFFICIAL=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
--- a/browser/config/mozconfigs/win64/l10n-mozconfig
+++ b/browser/config/mozconfigs/win64/l10n-mozconfig
@@ -1,14 +1,14 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
 . "$topsrcdir/build/mozconfig.no-compile"
 
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
-ac_add_options --with-branding=browser/branding/nightly
+ac_add_options --enable-official-branding
 
 ac_add_options --disable-nodejs
 unset NODEJS
 
 export MOZILLA_OFFICIAL=1
 
 # Don't autoclobber l10n, as this can lead to missing binaries and broken builds
 # Bug 1283438
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1,1 +1,1 @@
-78.0a1
+78.0
--- a/browser/config/version_display.txt
+++ b/browser/config/version_display.txt
@@ -1,1 +1,1 @@
-78.0a1
+78.0b1
--- a/build/mozconfig.common
+++ b/build/mozconfig.common
@@ -13,18 +13,18 @@
 if test -n "$USE_ARTIFACT"; then
 . "$topsrcdir/build/mozconfig.artifact.automation"
 fi
 
 mk_add_options AUTOCLOBBER=1
 
 ac_add_options --enable-crashreporter
 
-# Disable enforcing that add-ons are signed by the trusted root
-MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-0}
+# Enable enforcing that add-ons are signed by the trusted root
+MOZ_REQUIRE_SIGNING=${MOZ_REQUIRE_SIGNING-1}
 
 ac_add_options --enable-js-shell
 
 . "$topsrcdir/build/mozconfig.nasm"
 . "$topsrcdir/build/mozconfig.node"
 . "$topsrcdir/build/mozconfig.automation"
 . "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.cache"
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -5,9 +5,9 @@
 #    x.x.x.x
 #    x.x.x+
 #
 # Referenced by build/moz.configure/init.configure.
 # Hopefully I'll be able to automate replacement of *all*
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-78.0a1
+78.0