Merge mozilla-central to autoland

build/mozconfig.artifact

@@ -2,10 +2,6 @@
 
 # Enable the artifact build.
 ac_add_options --enable-artifact-builds
-if test -n "$MOZ_ARTIFACT_TASK_WIN32_OPT"; then
-  ac_add_options --enable-artifact-build-symbols=full
-else
-  ac_add_options --enable-artifact-build-symbols
-fi
+ac_add_options --enable-artifact-build-symbols
 
 . "$topsrcdir/build/mozconfig.no-compile"

taskcluster/ci/build/windows.yml

@@ -1170,6 +1170,7 @@ win64-aarch64-eme/opt:
     toolchains:
         - win64-node
 
+<<<<<<< working copy
 win64-aarch64-shippable/opt:
     description: "AArch64 Win64 Shippable"
     index:
@@ -1191,9 +1192,6 @@ win64-aarch64-shippable/opt:
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
             PERFHERDER_EXTRA_OPTIONS: aarch64
-            MOZ_ARTIFACT_TASK: {task-reference: '<win64-aarch64-opt>'}
-            MOZ_ARTIFACT_TASK_WIN32_OPT: {task-reference: '<win32-opt>'}
-            USE_ARTIFACT: '1'
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
@@ -1208,16 +1206,6 @@ win64-aarch64-shippable/opt:
             stage_platform: win64-aarch64
             mozconfig_platform: win64-aarch64
     run-on-projects: []  # Don't run by default yet
-    dependencies:
-        win32-opt: build-win32-shippable/opt
-        win64-aarch64-opt: build-win64-aarch64-nightly-no-eme/opt
-    fetches:
-        # Abuse fetches to copy the generated-files artifact from the non-eme
-        # build directly to the artifacts directory of this build.
-        win64-aarch64-opt:
-            - artifact: target.generated-files.tar.gz
-              extract: false
-              dest: ../public/build
     toolchains:
         - win64-clang-cl
         - win64-aarch64-rust
@@ -1286,9 +1274,6 @@ win64-aarch64-nightly/opt:
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
             PERFHERDER_EXTRA_OPTIONS: aarch64
-            MOZ_ARTIFACT_TASK: {task-reference: '<win64-aarch64-opt>'}
-            MOZ_ARTIFACT_TASK_WIN32_OPT: {task-reference: '<win32-opt>'}
-            USE_ARTIFACT: '1'
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
@@ -1301,17 +1286,11 @@ win64-aarch64-nightly/opt:
         extra-config:
             stage_platform: win64-aarch64
             mozconfig_platform: win64-aarch64
-    dependencies:
-        win32-opt: build-win32-nightly/opt
-        win64-aarch64-opt: build-win64-aarch64-nightly-no-eme/opt
-    fetches:
-        # Abuse fetches to copy the generated-files artifact from the non-eme
-        # build directly to the artifacts directory of this build.
-        win64-aarch64-opt:
-            - artifact: target.generated-files.tar.gz
-              extract: false
-              dest: ../public/build
     toolchains:
+        - win64-clang-cl
+        - win64-aarch64-rust
+        - win64-cbindgen
+        - win64-nasm
         - win64-node