Bug 1794517 - Make CI plain builds a little closer to local builds. r=firefox-build-system-reviewers,andi

Differential Revision: https://phabricator.services.mozilla.com/D159005

browser/config/mozconfigs/linux64/plain-opt

@@ -0,0 +1 @@
+ac_add_options --disable-release

browser/config/mozconfigs/macosx64/plain-opt

@@ -1 +1,2 @@
+ac_add_options --disable-release
 export MACOS_SDK_DIR=$MOZ_FETCHES_DIR/MacOSX11.3.sdk

browser/config/mozconfigs/win64/plain-opt

@@ -1,3 +1,4 @@
+ac_add_options --disable-release
 ac_add_options --target=x86_64-pc-mingw32
 
 . $topsrcdir/build/win64/mozconfig.vs-latest

moz.configure

@@ -154,12 +154,13 @@ option(env="MOZ_PGO", help="Build with profile guided optimizations")
 set_config("MOZ_PGO", depends("MOZ_PGO")(lambda x: bool(x)))
 
 
+# Imply --enable-release when MOZILLA_OFFICIAL is set rather than adjusting the
+# default so that we can't have both MOZILLA_OFFICIAL and --disable-release set.
 imply_option("--enable-release", mozilla_official)
-imply_option("--enable-release", depends_if("MOZ_AUTOMATION")(lambda x: True))
 
 option(
     "--enable-release",
-    default=milestone.is_release_or_beta,
+    default=milestone.is_release_or_beta | depends("MOZ_AUTOMATION")(lambda x: bool(x)),
     help="{Build|Do not build} with more conservative, release "
     "engineering-oriented options.{ This may slow down builds.|}",
 )