wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1212616 - Setup updates for b2gdroid, r=catlee

Browse Source
This commit is contained in:
Jordan Lund 2015-10-29 12:05:17 -07:00
parent 68fbe226a4
commit 523b6e4768
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
testing/mozharness/configs/builds/releng_sub_android_configs/64_api_11_b2gdroid.py
View File

@ -5,4 +5,5 @@ config = {
'src_mozconfig': 'mobile/android/b2gdroid/config/mozconfigs/nightly', 'src_mozconfig': 'mobile/android/b2gdroid/config/mozconfigs/nightly',
'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/b2gdroid/releng.manifest', 'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/b2gdroid/releng.manifest',
'multi_locale_config_platform': 'android', 'multi_locale_config_platform': 'android',
'enable_nightly_promotion': True,
} }

7
testing/mozharness/mozharness/mozilla/building/buildbase.py
View File

@ -814,6 +814,11 @@ or run without that action (ie: --no-{action})"
self.info("Skipping......") self.info("Skipping......")
return 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): def query_build_env(self, replace_dict=None, **kwargs):
c = self.config c = self.config
@ -833,7 +838,7 @@ or run without that action (ie: --no-{action})"
# first grab the buildid # first grab the buildid
env['MOZ_BUILD_DATE'] = self.query_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" env["IS_NIGHTLY"] = "yes"
# in branch_specifics.py we might set update_channel explicitly # in branch_specifics.py we might set update_channel explicitly
if c.get('update_channel'): if c.get('update_channel'):

1
testing/mozharness/scripts/fx_desktop_build.py
View File

@ -76,6 +76,7 @@ class FxDesktopBuild(BuildScript, object):
'compare_locales_vcs': 'hgtool', 'compare_locales_vcs': 'hgtool',
'influx_credentials_file': 'oauth.txt', 'influx_credentials_file': 'oauth.txt',
'build_resources_path': '%(abs_src_dir)s/obj-firefox/.mozbuild/build_resources.json', 'build_resources_path': '%(abs_src_dir)s/obj-firefox/.mozbuild/build_resources.json',
'nightly_promotion_branches': ['mozilla-central', 'mozilla-aurora'],
# try will overwrite these # try will overwrite these
'clone_with_purge': False, 'clone_with_purge': False,