mozilla-central: changeset 389077:f70c299caf77e6d5e30a186ba9dc56170c7917d9

author	Andrew Halberstadt <ahalberstadt@mozilla.com>
	Fri, 27 Oct 2017 11:48:23 -0400
changeset 389077	f70c299caf77e6d5e30a186ba9dc56170c7917d9
parent 389076	4e36da3344e8c1c668b1932b1d4e57fc45ed6258
child 389078	68a8bde575ef1669a3c05e8c91b009c20948c27f
push id	32777
push user	archaeopteryx@coole-files.de
push date	Mon, 30 Oct 2017 22:44:45 +0000
treeherder	mozilla-central@dd0f265a1300 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	dustin
bugs	1412136
milestone	58.0a1
first release with	nightly linux32 3f627210c55d / 58.0a1 / 20171031220132 / files nightly linux64 3f627210c55d / 58.0a1 / 20171031220132 / files nightly mac 3f627210c55d / 58.0a1 / 20171031220132 / files nightly win32 3f627210c55d / 58.0a1 / 20171031220132 / files nightly win64 3f627210c55d / 58.0a1 / 20171031220132 / files
last release without	nightly linux32 515407ebfa14 / 58.0a1 / 20171030103605 / files nightly linux64 515407ebfa14 / 58.0a1 / 20171030103605 / files nightly mac 515407ebfa14 / 58.0a1 / 20171030103605 / files nightly win32 515407ebfa14 / 58.0a1 / 20171030103605 / files nightly win64 515407ebfa14 / 58.0a1 / 20171030103605 / files

--- a/taskcluster/taskgraph/templates/artifact.yml
+++ b/taskcluster/taskgraph/templates/artifact.yml
@@ -1,22 +1,14 @@
 ---
 $if: task.tags['kind'] == "build"
 then:
-    $merge:
+    $mergeDeep:
         - $eval: task
         - extra:
-              $merge:
-                  - $eval: task.extra
-                  - treeherder:
-                        $merge:
-                            - $eval: task.extra.treeherder
-                            - symbol: Ba
+              treeherder:
+                  symbol: Ba
         - payload:
-              $merge:
-                  - $eval: task.payload
-                  - env:
-                        $merge:
-                            - $eval: task.payload.env
-                            - USE_ARTIFACT:
-                                  $eval: input.enabled
+              env:
+                  USE_ARTIFACT:
+                      $eval: input.enabled
 else:
     $eval: task

--- a/taskcluster/taskgraph/templates/env.yml
+++ b/taskcluster/taskgraph/templates/env.yml
@@ -1,9 +1,5 @@
-$merge:
+$mergeDeep:
     - $eval: task
     - payload:
-          $merge:
-              - $eval: task.payload
-              - env:
-                    $merge:
-                        - $eval: task.payload.env
-                        - $eval: input
+          env:
+              $eval: input

taskcluster/taskgraph/templates/artifact.yml		file \| annotate \| diff \| comparison \| revisions
taskcluster/taskgraph/templates/env.yml		file \| annotate \| diff \| comparison \| revisions