merge master

Author: sebastienlagarde

.yamato/_green_job_revisions_trunk.metafile

@@ -1,5 +1,5 @@
 '2021_2':
-  updated_at_UTC: '2021-07-21 00:08:39.206030'
+  updated_at_UTC: '2021-07-28 13:05:47.956163'
   changeset:
-    id: 9fdfb71d55939f7c9cc66282d1cbb726199e3798
-    date: '2021-07-20T16:00:36'
+    id: b954914b473d74f992ea002de0f8757fd9bfb943
+    date: '2021-07-28T10:16:28'

.yamato/_latest_editor_versions_2021.2.metafile

@@ -1,5 +1,5 @@
 trunk:
-  updated_at_UTC: '2021-07-22 23:50:12.774529'
+  updated_at_UTC: '2021-07-27 23:16:44.358406'
   changeset:
-    id: 9a09482b68b861d789bacf3fc8d2d188f9cf71f1
-    date: '2021-07-22T18:51:30'
+    id: b9a9b5b293ba7e37e671515792b8a25ccf726ec5
+    date: '2021-07-27T16:39:49'

.yamato/_latest_editor_versions_trunk.metafile

@@ -12,9 +12,7 @@ editors: # applied for all yml files
     ono_branch_var: ONO_BRANCH_TRUNK
     editor_pinning:
       enabled: True
-      green_abv_required: False
       nr_commits_to_retrieve: 1
-      store_green_revisions: False
     allow_triggers: True
     variables:
       CACHE_ARGS: '{{cache.flags}}'
@@ -24,9 +22,7 @@ editors: # applied for all yml files
     ono_branch_var: ONO_BRANCH_2021_2
     editor_pinning:
       enabled: True
-      green_abv_required: False
       nr_commits_to_retrieve: 100
-      store_green_revisions: False
     allow_triggers: True
     variables:
       CACHE_ARGS: '{{cache.flags}}'
@@ -35,7 +31,6 @@ editors: # applied for all yml files
     rerun_strategy: on_new_revision
     editor_pinning:
       enabled: False
-      green_abv_required: False
     fast: False
     allow_triggers: False
     variables:

.yamato/config/__shared.metafile

@@ -3,14 +3,7 @@ editor_pin_agent: package_ci_ubuntu_small
 
 # EDITOR PINNING
 
-
-trunk_track: '2021.1' # track running on trunk: this must match across all release branches
-editor_tracks: # specifies tracks which go in _latest_editor_versions: this must differ per release branches
-# - trunk
-- 2021.2
-
 editor_versions_file: .yamato/_latest_editor_versions_TRACK.metafile
-green_revisions_file: .yamato/_green_job_revisions_TRACK.metafile
 
 platforms: # Components to have unity-downloader-cli to trigger.
   - name: Win
@@ -46,45 +39,3 @@ platforms: # Components to have unity-downloader-cli to trigger.
       - editor
       - il2cpp
       - ios
-
-versions_file_header: |
-  # WARNING: This file is automatically generated.
-  # To add new Unity Editor tracks, the script needs to be updated.
-
-
-
-# STORING GREEN REVISIONS
-yamato_project_id: 902
-nightly_job_definition: .yamato%252F_abv.yml%2523all_project_ci_nightly_trunk
-green_revision_jobs:
-  - _Nightly ABV against trunk
-
-  - Nightly Universal_Split - trunk
-  - Universal_Split PR Job - trunk
-
-  - Nightly URP_2D - trunk
-  - URP_2D PR Job - trunk
-
-  - Nightly URP_Foundation - trunk
-  - URP_Foundation PR Job - trunk
-
-  - Nightly URP_Lighting - trunk
-  - URP_Lighting PR Job - trunk
-
-  - Nightly URP_PostPro - trunk
-  - URP_PostPro PR Job - trunk
-
-  - Nightly URP_Terrain - trunk
-  - URP_Terrain PR Job - trunk
-
-  - Nightly HDRP - trunk
-  - HDRP PR Job - trunk
-
-  - Nightly ShaderGraph - trunk
-  - ShaderGraph PR Job - trunk
-
-  - Nightly VFX_HDRP - trunk
-  - VFX_HDRP PR Job - trunk
-
-  - Nightly VFX_URP - trunk
-  - VFX_URP PR Job - trunk

.yamato/config/_editor.metafile

@@ -8,15 +8,15 @@ templates:
       - vfx
       - config
       - hdrp
-    hascodependencies: 1
+    include_prepack_step: True
   - name: Universal Template
     id: universal_template
     packagename: com.unity.template-universal
     dependencies:
       - core
       - shadergraph
       - universal
-    hascodependencies: 1
+    include_prepack_step: True
 platforms:
   - name: Win
   - name: OSX