Bug 1371871 - Do not install unnecessary files in an artifact build. r=mshal
authorChris Manchester <cmanchester@mozilla.com>
Wed, 21 Jun 2017 16:20:18 -0700
changeset 365400 4807dbbaccc30e6816b19525c786dcda1ffbea32
parent 365399 13e4d84bb4e9809f24b1a9a80de5bb51ff25c798
child 365401 0d28abfd6ad4d3aeaf7ff0167dac59c18998a994
push id32071
push usercbook@mozilla.com
push dateThu, 22 Jun 2017 10:45:43 +0000
treeherdermozilla-central@71733bc984a1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1371871
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1371871 - Do not install unnecessary files in an artifact build. r=mshal This prevents us from redundantly installing httpd.js and httpd.manifest from the test package during an artifact build, which interferes with the Tup backend's handling of these files as symlinks. MozReview-Commit-ID: LuMurUc1P36
python/mozbuild/mozbuild/artifacts.py
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -133,17 +133,17 @@ class ArtifactJob(object):
         ('bin/fileid', ('bin', 'bin')),
         ('bin/geckodriver', ('bin', 'bin')),
         ('bin/pk12util', ('bin', 'bin')),
         ('bin/screentopng', ('bin', 'bin')),
         ('bin/ssltunnel', ('bin', 'bin')),
         ('bin/xpcshell', ('bin', 'bin')),
         ('bin/plugins/gmp-*/*/*', ('bin/plugins', 'bin')),
         ('bin/plugins/*', ('bin/plugins', 'plugins')),
-        ('bin/components/*', ('bin/components', 'bin/components')),
+        ('bin/components/*.xpt', ('bin/components', 'bin/components')),
     }
 
     # We can tell our input is a test archive by this suffix, which happens to
     # be the same across platforms.
     _test_archive_suffix = '.common.tests.zip'
 
     def __init__(self, package_re, tests_re, log=None, download_symbols=False, substs=None):
         self._package_re = re.compile(package_re)