Bug 1362949 - Update artifact build code to accept buildbot or taskcluster style artifact names for OS X. r=nalexander
MozReview-Commit-ID: Dr0tv8FM7LP
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -475,20 +475,20 @@ JOB_DETAILS = {
'linux-opt': (LinuxArtifactJob, (r'public/build/target\.tar\.bz2',
r'public/build/target\.common\.tests\.zip')),
'linux-debug': (LinuxArtifactJob, (r'public/build/target\.tar\.bz2',
r'public/build/target\.common\.tests\.zip')),
'linux64-opt': (LinuxArtifactJob, (r'public/build/target\.tar\.bz2',
r'public/build/target\.common\.tests\.zip')),
'linux64-debug': (LinuxArtifactJob, (r'public/build/target\.tar\.bz2',
r'public/build/target\.common\.tests\.zip')),
- 'macosx64-opt': (MacArtifactJob, (r'public/build/firefox-(.*)\.mac\.dmg',
- r'public/build/firefox-(.*)\.common\.tests\.zip')),
- 'macosx64-debug': (MacArtifactJob, (r'public/build/firefox-(.*)\.mac\.dmg',
- r'public/build/firefox-(.*)\.common\.tests\.zip')),
+ 'macosx64-opt': (MacArtifactJob, (r'public/build/firefox-(.*)\.mac\.dmg|public/build/target\.dmg',
+ r'public/build/firefox-(.*)\.common\.tests\.zip|public/build/target\.common\.tests\.zip')),
+ 'macosx64-debug': (MacArtifactJob, (r'public/build/firefox-(.*)\.mac\.dmg|public/build/target\.dmg',
+ r'public/build/firefox-(.*)\.common\.tests\.zip|public/build/target\.common\.tests\.zip')),
'win32-opt': (WinArtifactJob, (r'public/build/firefox-(.*)\.win32.zip',
r'public/build/firefox-(.*)\.common\.tests\.zip')),
'win32-debug': (WinArtifactJob, (r'public/build/firefox-(.*)\.win32.zip',
r'public/build/firefox-(.*)\.common\.tests\.zip')),
'win64-opt': (WinArtifactJob, (r'public/build/firefox-(.*)\.win64.zip',
r'public/build/firefox-(.*)\.common\.tests\.zip')),
'win64-debug': (WinArtifactJob, (r'public/build/firefox-(.*)\.win64.zip',
r'public/build/firefox-(.*)\.common\.tests\.zip')),