Bug 1432213 Fix the MinGW build on the beta branch and re-enable it
When we branched to beta, the MinGW build started failing with a strange error
like "could not find the robustcheckout Mercurial extension". We disabled it
for a while, but now we're re-enabling it (and fixing the problem.)
The root culprit of this was that we were using the incorrect mozconfig. MinGW
does all sorts of stuff in the mozconfig, but the beta branch overrides the
mozconfig using platform_overrides in
testing/mozharness/configs/builds/branch_specifics.py
We avoid this override by changing the MinGW platform so it doesn't match
and the mozconfig doesn't get overridden.
MozReview-Commit-ID: JkETWCRHacO
--- a/taskcluster/taskgraph/target_tasks.py
+++ b/taskcluster/taskgraph/target_tasks.py
@@ -55,18 +55,16 @@ def filter_beta_release_tasks(task, para
'push-apk', 'push-apk-breakpoint',
'repackage-l10n',
]
platform = task.attributes.get('build_platform')
if platform in (
# On beta, Nightly builds are already PGOs
'linux-pgo', 'linux64-pgo',
'win32-pgo', 'win64-pgo',
- # MinGW build is broken on beta
- 'win32-mingw32',
):
return False
if str(platform).startswith('android') and 'nightly' in str(platform):
return False
if platform in (
'linux', 'linux64',
'macosx64',
--- a/testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_windows_32_mingw_builds.py
@@ -29,18 +29,18 @@ config = {
'vcs_share_base': '/builds/hg-shared',
'enable_count_ctors': False,
#########################################################################
#########################################################################
###### 32 bit specific ######
'base_name': 'WINNT_5.2_MINGW_%(branch)s',
- 'platform': 'win32',
- 'stage_platform': 'win32',
+ 'platform': 'win32-mingw32',
+ 'stage_platform': 'win32-mingw32',
'publish_nightly_en_US_routes': False,
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'DISPLAY': ':2',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': '%(abs_obj_dir)s',
'TINDERBOX_OUTPUT': '1',
'TOOLTOOL_CACHE': '/builds/worker/tooltool-cache',