Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
authorffxbld <release@mozilla.com>
Mon, 13 May 2019 10:35:27 +0000
changeset 532394 77e0fe8dbdd3384fb8407cdad5be64a18ca6182e
parent 532393 f7b8af02bfc659b8842ba7f3ba651cc1efdef23f
child 532395 5f69e13102d4488809f8c692f4a2392fdfb6c080
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrelease
milestone68.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
browser/confvars.sh
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 1533481 - Update to ICU 64 requires clobber
+Merge day clobber
\ No newline at end of file
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,11 +1,11 @@
 ac_add_options --with-l10n-base=../../l10n
 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,11 +1,11 @@
 ac_add_options --with-l10n-base=../../l10n
 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
@@ -6,17 +6,17 @@ if test `uname -s` = "Linux"; then
   ac_add_options --target=x86_64-apple-darwin
   export MKFSHFS=$topsrcdir/hfsplus-tools/newfs_hfs
   export DMG_TOOL=$topsrcdir/dmg/dmg
   export HFS_TOOL=$topsrcdir/dmg/hfsplus
 fi
 
 ac_add_options --with-l10n-base=../../l10n
 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,16 +1,16 @@
 . "$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-l10n-base=../../l10n
-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,15 +1,15 @@
 . "$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-l10n-base=../../l10n
-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,15 +1,15 @@
 . "$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-l10n-base=../../l10n
-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 @@
-68.0a1
+68.0
--- a/browser/config/version_display.txt
+++ b/browser/config/version_display.txt
@@ -1,1 +1,1 @@
-68.0a1
+68.0b1
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -49,18 +49,18 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3
 # ACCEPTED_MAR_CHANNEL_IDS should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
 if test "$MOZ_UPDATE_CHANNEL" = "aurora"; then
   ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora
   MAR_CHANNEL_ID=firefox-mozilla-aurora
 else
-  ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
-  MAR_CHANNEL_ID=firefox-mozilla-central
+  ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
+  MAR_CHANNEL_ID=firefox-mozilla-beta
 fi
 # ASan reporter builds should have different channel ids
 if [ "${MOZ_ASAN_REPORTER}" = "1" ]; then
     ACCEPTED_MAR_CHANNEL_IDS="${ACCEPTED_MAR_CHANNEL_IDS}-asan"
     MAR_CHANNEL_ID="${MAR_CHANNEL_ID}-asan"
 fi
 
 MOZ_PROFILE_MIGRATOR=1
--- 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.
 #--------------------------------------------------------
 
-68.0a1
+68.0