зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1212616 - Setup updates for b2gdroid, r=catlee
This commit is contained in:
Родитель
df747d18d1
Коммит
9d15b19f48
|
@ -5,4 +5,5 @@ config = {
|
|||
'src_mozconfig': 'mobile/android/b2gdroid/config/mozconfigs/nightly',
|
||||
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/b2gdroid/releng.manifest',
|
||||
'multi_locale_config_platform': 'android',
|
||||
'enable_nightly_promotion': True,
|
||||
}
|
||||
|
|
|
@ -814,6 +814,11 @@ or run without that action (ie: --no-{action})"
|
|||
self.info("Skipping......")
|
||||
return
|
||||
|
||||
def query_is_nightly_promotion(self):
|
||||
platform_enabled = self.config.get('enable_nightly_promotion')
|
||||
branch_enabled = self.branch in self.config.get('nightly_promotion_branches')
|
||||
return platform_enabled and branch_enabled
|
||||
|
||||
def query_build_env(self, replace_dict=None, **kwargs):
|
||||
c = self.config
|
||||
|
||||
|
@ -833,7 +838,7 @@ or run without that action (ie: --no-{action})"
|
|||
# first grab the buildid
|
||||
env['MOZ_BUILD_DATE'] = self.query_buildid()
|
||||
|
||||
if self.query_is_nightly():
|
||||
if self.query_is_nightly() or self.query_is_nightly_promotion():
|
||||
env["IS_NIGHTLY"] = "yes"
|
||||
# in branch_specifics.py we might set update_channel explicitly
|
||||
if c.get('update_channel'):
|
||||
|
|
|
@ -76,6 +76,7 @@ class FxDesktopBuild(BuildScript, object):
|
|||
'compare_locales_vcs': 'hgtool',
|
||||
'influx_credentials_file': 'oauth.txt',
|
||||
'build_resources_path': '%(abs_src_dir)s/obj-firefox/.mozbuild/build_resources.json',
|
||||
'nightly_promotion_branches': ['mozilla-central', 'mozilla-aurora'],
|
||||
|
||||
# try will overwrite these
|
||||
'clone_with_purge': False,
|
||||
|
|
Загрузка…
Ссылка в новой задаче