Verified Commit a7b40af5 authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by boklm
Browse files

BB 44118: Disable Mozilla's nightly and early beta features.

parent da83a08d

build/moz.configure/init.configure

+5 −7
Changes for build/moz.configure/init.configure: 5 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -1064,10 +1064,10 @@ option( 
)





# set RELEASE_OR_BETA and NIGHTLY_BUILD variables depending on the cycle we're in

# The logic works like this:

# - if we have "a1" in GRE_MILESTONE, we're building Nightly (define NIGHTLY_BUILD)

# - otherwise, we're building Release/Beta (define RELEASE_OR_BETA)

# Firefox looks for "a" or "a1" in the milestone to detect whether nightly

# features should be enabled. We do not want them, because we want our nightly

# builds to be as close as possible to actual releases.

# So we set always is_release_or_beta to True.

@depends(

    build_environment,

    build_project,
@@ -1131,9 +1131,7 @@ def milestone(build_env, build_project, version_path, as_milestone, _): 


    is_nightly = is_release_or_beta = None



    if "a1" in milestone:

        is_nightly = True

    elif "a" not in milestone:

    # Do not enable extra nightly features

    is_release_or_beta = True



    major_version = milestone.split(".")[0]