Bug 1527011 - Support win64-aarch64 artifact builds; r=nalexander
authorGeoff Brown <gbrown@mozilla.com>
Tue, 12 Feb 2019 18:03:38 -0700
changeset 458730 636d2c00234d
parent 458729 bdbab05f9667
child 458731 875a93046d84
child 458854 9f93017d5be0
push id35546
push userrmaries@mozilla.com
push dateWed, 13 Feb 2019 04:27:59 +0000
treeherdermozilla-central@636d2c00234d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1527011
milestone67.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 1527011 - Support win64-aarch64 artifact builds; r=nalexander
browser/config/mozconfigs/win64-aarch64/artifact
browser/config/mozconfigs/win64-aarch64/debug-artifact
python/mozbuild/mozbuild/artifacts.py
taskcluster/ci/build/windows.yml
new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/win64-aarch64/artifact
@@ -0,0 +1,13 @@
+. "$topsrcdir/build/mozconfig.artifact.automation"
+
+# Needed to set SourceRepository in application.ini (used by Talos)
+export MOZILLA_OFFICIAL=1
+
+. "$topsrcdir/browser/config/mozconfigs/win64-aarch64/common-win64"
+. "$topsrcdir/browser/config/mozconfigs/common"
+. "$topsrcdir/build/mozconfig.win-common"
+. "$topsrcdir/build/win64-aarch64/mozconfig.vs-latest"
+. "$topsrcdir/build/mozconfig.common.override"
+
+. "$topsrcdir/build/mozconfig.artifact"
+ac_add_options --enable-artifact-build-symbols
new file mode 100644
--- /dev/null
+++ b/browser/config/mozconfigs/win64-aarch64/debug-artifact
@@ -0,0 +1,12 @@
+. "$topsrcdir/build/mozconfig.artifact.automation"
+
+. "$topsrcdir/browser/config/mozconfigs/win64-aarch64/common-win64"
+. "$topsrcdir/browser/config/mozconfigs/common"
+. "$topsrcdir/build/mozconfig.win-common"
+. "$topsrcdir/build/win64-aarch64/mozconfig.vs-latest"
+. "$topsrcdir/build/mozconfig.common.override"
+
+. "$topsrcdir/build/mozconfig.artifact"
+ac_add_options --enable-artifact-build-symbols
+
+ac_add_options --enable-debug
--- a/python/mozbuild/mozbuild/artifacts.py
+++ b/python/mozbuild/mozbuild/artifacts.py
@@ -587,16 +587,23 @@ JOB_DETAILS = {
                                    r'public/build/target\.common\.tests\.(zip|tar\.gz)')),
     'win64-pgo': (WinArtifactJob, (r'public/build/firefox-(.*)\.win64\.(zip|tar\.gz)|'
                                    r'public/build/target\.(zip|tar\.gz)',
                                    r'public/build/firefox-(.*)\.common\.tests\.(zip|tar\.gz)|'
                                    r'public/build/target\.common\.tests\.(zip|tar\.gz)')),
     'win64-debug': (WinArtifactJob, (r'public/build/firefox-(.*)\.win64\.(zip|tar\.gz)|public/build/target\.(zip|tar\.gz)',
                                      r'public/build/firefox-(.*)\.common\.tests\.(zip|tar\.gz)|'
                                      r'public/build/target\.common\.tests\.(zip|tar\.gz)')),
+    'win64-aarch64-opt': (WinArtifactJob, (r'public/build/firefox-(.*)\.win64\.(zip|tar\.gz)|'
+                                           r'public/build/target\.(zip|tar\.gz)',
+                                           r'public/build/firefox-(.*)\.common\.tests\.(zip|tar\.gz)|'
+                                           r'public/build/target\.common\.tests\.(zip|tar\.gz)')),
+    'win64-aarch64-debug': (WinArtifactJob, (r'public/build/firefox-(.*)\.win64\.(zip|tar\.gz)|public/build/target\.(zip|tar\.gz)',
+                                             r'public/build/firefox-(.*)\.common\.tests\.(zip|tar\.gz)|'
+                                             r'public/build/target\.common\.tests\.(zip|tar\.gz)')),
 }
 
 
 
 def get_job_details(job, log=None,
                     download_symbols=False,
                     download_host_bins=False,
                     substs=None):
@@ -1018,16 +1025,18 @@ class Artifacts(object):
 
         target_64bit = False
         if self._substs['target_cpu'] == 'x86_64':
             target_64bit = True
 
         if self._defines.get('XP_LINUX', False):
             return ('linux64' if target_64bit else 'linux') + target_suffix
         if self._defines.get('XP_WIN', False):
+            if self._substs['target_cpu'] == 'aarch64':
+                return 'win64-aarch64' + target_suffix
             return ('win64' if target_64bit else 'win32') + target_suffix
         if self._defines.get('XP_MACOSX', False):
             # We only produce unified builds in automation, so the target_cpu
             # check is not relevant.
             return 'macosx64' + target_suffix
         raise Exception('Cannot determine default job for |mach artifact|!')
 
     def _pushheads_from_rev(self, rev, count):
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -1104,16 +1104,17 @@ win64-aarch64/opt:
             PERFHERDER_EXTRA_OPTIONS: aarch64
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/releng_base_firefox.py
             - builds/taskcluster_base_windows.py
+            - builds/taskcluster_base_win64.py
         extra-config:
             stage_platform: win64-aarch64
             mozconfig_platform: win64-aarch64
     toolchains:
         - win64-clang-cl
         - win64-aarch64-rust
         - win64-cbindgen
         - win64-sccache