diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-02-20 22:00:59 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-22 13:58:16 +0000 |
| commit | 5aa65d2aeab36ea8de8129c0babcf70a5e4e662a (patch) | |
| tree | 36ed652ffb09104d8a10c01261b851329f34882f /build | |
| parent | 712ca7303b0835772f8abca85ebec981e254a017 (diff) | |
| download | uxp-5aa65d2aeab36ea8de8129c0babcf70a5e4e662a.tar.gz | |
Issue #1877 - Resolve NIGHTLY_BUILD conditionals.
Diffstat (limited to 'build')
| -rw-r--r-- | build/moz.configure/init.configure | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index 281f2c1ad7..aab1b755bb 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -652,11 +652,7 @@ set_define('MOZ_BUILD_APP', build_project) add_old_configure_assignment('MOZ_BUILD_APP', build_project) -# 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, if we have "a" in GRE_MILESTONE, we're building Nightly or Aurora -# - otherwise, we're building Release/Beta (define RELEASE_OR_BETA) +# set RELEASE_OR_BETA and NIGHTLY_BUILD variables for compatibility @depends(check_build_environment, '--help') @imports(_from='__builtin__', _import='open') def milestone(build_env, _): @@ -666,12 +662,8 @@ def milestone(build_env, _): with open(milestone_path, 'r') as fh: milestone = fh.read().splitlines()[-1] - is_nightly = is_release_or_beta = None - - if 'a1' in milestone: - is_nightly = True - elif 'a' not in milestone: - is_release_or_beta = True + is_nightly = None + is_release_or_beta = True return namespace(version=milestone, is_nightly=is_nightly, |