Bug 1362949 - Update artifact build code to accept buildbot or taskcl…

…uster style artifact names for OS X. r=nalexander MozReview-Commit-ID: Dr0tv8FM7LP
Brli · May 8, 2017 · 57593de · 57593de
1 parent 22e938f
commit 57593de
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py
@@ -480,10 +480,10 @@ def process_package_artifact(self, filename, processed_filename):
                                        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',