From 9fbb588739966a230d2102e957c750a9fdd8a7b6 Mon Sep 17 00:00:00 2001 From: Chris Manchester Date: Fri, 28 Jul 2017 18:47:23 -0700 Subject: [PATCH] Bug 1385391 - Update artifact names for artifact builds to reflect Taskcluster package names on windows. r=nalexander MozReview-Commit-ID: kC09UUfAsN --HG-- extra : rebase_source : 0c3eeb1251f7ede7689a140551b09964ec6b80e3 --- python/mozbuild/mozbuild/artifacts.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/python/mozbuild/mozbuild/artifacts.py b/python/mozbuild/mozbuild/artifacts.py index d4fb0676faa9..795352c3044c 100644 --- a/python/mozbuild/mozbuild/artifacts.py +++ b/python/mozbuild/mozbuild/artifacts.py @@ -490,14 +490,14 @@ JOB_DETAILS = { 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')), + 'win32-opt': (WinArtifactJob, (r'public/build/firefox-(.*)\.win32\.zip|public/build/target\.zip', + r'public/build/firefox-(.*)\.common\.tests\.zip|public/build/target\.common\.tests\.zip')), + 'win32-debug': (WinArtifactJob, (r'public/build/firefox-(.*)\.win32\.zip|public/build/target\.zip', + r'public/build/firefox-(.*)\.common\.tests\.zip|public/build/target\.common\.tests\.zip')), + 'win64-opt': (WinArtifactJob, (r'public/build/firefox-(.*)\.win64\.zip|public/build/target\.zip', + r'public/build/firefox-(.*)\.common\.tests\.zip|public/build/target\.common\.tests\.zip')), + 'win64-debug': (WinArtifactJob, (r'public/build/firefox-(.*)\.win64\.zip|public/build/target\.zip', + r'public/build/firefox-(.*)\.common\.tests\.zip|public/build/target\.common\.tests\.zip')), }