Merge branch 'master' into vfx/fix/1289829-add-test-for-exact-fixed-time-step

# Conflicts:
#	com.unity.visualeffectgraph/Documentation~/VisualEffectGraphAsset.md

Author: PaulDemeulenaere

.yamato/_abv.yml

@@ -23,6 +23,8 @@ all_project_ci_trunk:
          rerun: on_new_revision
       -  path: .yamato/_projectcontext.yml#all_package_ci_project_trunk
          rerun: on_new_revision
+    variables:
+        CUSTOM_REVISION: '{{trunk.changeset.id}}'
 all_project_ci_nightly_trunk:
     name: _Nightly ABV against trunk
     dependencies:
@@ -48,6 +50,8 @@ all_project_ci_nightly_trunk:
          rerun: on_new_revision
       -  path: .yamato/_projectcontext.yml#all_package_ci_project_trunk
          rerun: on_new_revision
+    variables:
+        CUSTOM_REVISION: '{{trunk.changeset.id}}'
     triggers:
         recurring:
           -  branch: master
@@ -89,6 +93,8 @@ trunk_verification_trunk:
          rerun: on_new_revision
       -  path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_cache_mono_Linear_trunk
          rerun: on_new_revision
+    variables:
+        CUSTOM_REVISION: '{{trunk.changeset.id}}'
 all_project_ci_CUSTOM-REVISION:
     name: _ABV for SRP repository (all PR jobs) - CUSTOM-REVISION
     dependencies:

.yamato/_editor_pinning.yml

@@ -27,7 +27,7 @@ editor-pinning-update:
       -  git config --global user.name "[email protected]"
       -  git config --global user.email "[email protected]"
       -  git checkout $GIT_BRANCH
-      -  python3 .yamato/script/editor_scripts/update_revisions.py --commit-and-push
+      -  python3 .yamato/script/editor_scripts/update_revisions.py --track trunk --ono-branch $ONO_BRANCH_TRUNK --api-key $ONO_API_KEY --commit-and-push
     triggers:
         recurring:
           -  branch: master

.yamato/_editor_priming.yml

@@ -8,6 +8,29 @@
 
 ---
 
+editor:priming:trunk:Win:
+    name: '[trunk,Win] Editor priming'
+    agent:
+        type: Unity::VM
+        image: package-ci/ubuntu:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: '{{trunk.changeset.id}}'
+    commands:
+      -  sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
+      -  curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
+      -  sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
+      -  sudo apt update
+      -  sudo apt install unity-downloader-cli
+      -  unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
 editor:priming:CUSTOM-REVISION:Win:
     name: '[CUSTOM-REVISION,Win] Editor priming'
     agent:
@@ -54,6 +77,29 @@ editor:priming:test_min_editor:Win:
         unity_revision.zip:
             paths:
               -  "unity_revision.txt"
+editor:priming:trunk:OSX:
+    name: '[trunk,OSX] Editor priming'
+    agent:
+        type: Unity::VM
+        image: package-ci/ubuntu:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: '{{trunk.changeset.id}}'
+    commands:
+      -  sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
+      -  curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
+      -  sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
+      -  sudo apt update
+      -  sudo apt install unity-downloader-cli
+      -  unity-downloader-cli -u $CUSTOM_REVISION -o macos --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
 editor:priming:CUSTOM-REVISION:OSX:
     name: '[CUSTOM-REVISION,OSX] Editor priming'
     agent:
@@ -100,6 +146,29 @@ editor:priming:test_min_editor:OSX:
         unity_revision.zip:
             paths:
               -  "unity_revision.txt"
+editor:priming:trunk:Linux:
+    name: '[trunk,Linux] Editor priming'
+    agent:
+        type: Unity::VM
+        image: package-ci/ubuntu:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: '{{trunk.changeset.id}}'
+    commands:
+      -  sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
+      -  curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
+      -  sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
+      -  sudo apt update
+      -  sudo apt install unity-downloader-cli
+      -  unity-downloader-cli -u $CUSTOM_REVISION -o linux --wait --skip-download -c editor -c il2cpp  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
 editor:priming:CUSTOM-REVISION:Linux:
     name: '[CUSTOM-REVISION,Linux] Editor priming'
     agent:
@@ -146,6 +215,29 @@ editor:priming:test_min_editor:Linux:
         unity_revision.zip:
             paths:
               -  "unity_revision.txt"
+editor:priming:trunk:Android:
+    name: '[trunk,Android] Editor priming'
+    agent:
+        type: Unity::VM
+        image: package-ci/ubuntu:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: '{{trunk.changeset.id}}'
+    commands:
+      -  sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
+      -  curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
+      -  sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
+      -  sudo apt update
+      -  sudo apt install unity-downloader-cli
+      -  unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp -c android  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
 editor:priming:CUSTOM-REVISION:Android:
     name: '[CUSTOM-REVISION,Android] Editor priming'
     agent:
@@ -192,6 +284,29 @@ editor:priming:test_min_editor:Android:
         unity_revision.zip:
             paths:
               -  "unity_revision.txt"
+editor:priming:trunk:XRQuest:
+    name: '[trunk,XRQuest] Editor priming'
+    agent:
+        type: Unity::VM
+        image: package-ci/ubuntu:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: '{{trunk.changeset.id}}'
+    commands:
+      -  sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
+      -  curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
+      -  sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
+      -  sudo apt update
+      -  sudo apt install unity-downloader-cli
+      -  unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp -c android  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
 editor:priming:CUSTOM-REVISION:XRQuest:
     name: '[CUSTOM-REVISION,XRQuest] Editor priming'
     agent:
@@ -238,6 +353,29 @@ editor:priming:test_min_editor:XRQuest:
         unity_revision.zip:
             paths:
               -  "unity_revision.txt"
+editor:priming:trunk:iPhone:
+    name: '[trunk,iPhone] Editor priming'
+    agent:
+        type: Unity::VM
+        image: package-ci/ubuntu:stable
+        flavor: b1.small
+    skip_checkout: true
+    variables:
+        PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
+        DISPLAY: ":0"
+        UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
+        CUSTOM_REVISION: '{{trunk.changeset.id}}'
+    commands:
+      -  sudo rm -f /etc/apt/sources.list /etc/apt/sources.list.d/{nodesource,teamviewer,deadsnakes-ubuntu-ppa-}*
+      -  curl -L https://artifactory.prd.it.unity3d.com/artifactory/api/gpg/key/public | sudo apt-key add -
+      -  sudo sh -c "echo 'deb https://artifactory.prd.it.unity3d.com/artifactory/unity-apt-local bionic main' > /etc/apt/sources.list.d/unity.list"
+      -  sudo apt update
+      -  sudo apt install unity-downloader-cli
+      -  unity-downloader-cli -u $CUSTOM_REVISION -o macos --wait --skip-download -c editor -c il2cpp -c ios  > unity_revision.txt
+    artifacts:
+        unity_revision.zip:
+            paths:
+              -  "unity_revision.txt"
 editor:priming:CUSTOM-REVISION:iPhone:
     name: '[CUSTOM-REVISION,iPhone] Editor priming'
     agent:

.yamato/_green_job_revisions_trunk.metafile

@@ -53,15 +53,15 @@ shadergraph_pr_job_-_trunk:
       updated_at: '2021-04-25 13:33:54.600865'
       version: ''
 vfx_urp_pr_job_-_trunk:
-  updated_at: '2021-04-28 10:30:19.474513'
+  updated_at: '2021-04-29 07:30:45.029832'
   last_green_revisions:
     Android:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
+      revision: 576b9143c951f07dc76261e61c4ae7b5a1b64491
+      updated_at: '2021-04-29 00:02:48.083173'
       version: ''
     Linux:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 18:08:03.332305'
+      revision: 576b9143c951f07dc76261e61c4ae7b5a1b64491
+      updated_at: '2021-04-29 00:02:48.083173'
       version: ''
     OSX:
       revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
@@ -72,12 +72,12 @@ vfx_urp_pr_job_-_trunk:
       updated_at: '2021-04-25 18:08:03.332305'
       version: ''
     iPhone:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
+      revision: 576b9143c951f07dc76261e61c4ae7b5a1b64491
+      updated_at: '2021-04-29 00:02:48.083173'
       version: ''
     XRQuest:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
+      revision: 576b9143c951f07dc76261e61c4ae7b5a1b64491
+      updated_at: '2021-04-29 00:02:48.083173'
       version: ''
 vfx_hdrp_pr_job_-_trunk:
   updated_at: '2021-04-20 07:31:59.616263'

.yamato/_latest_editor_versions_trunk.metafile

@@ -1,80 +1,5 @@
-editor_version_names:
-- trunk_latest_internal
-- trunk_latest_public
-- trunk_staging
-editor_versions:
-  trunk_latest_internal:
-    Android:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-    Linux:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 18:08:03.332305'
-      version: ''
-    OSX:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-    Win:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 18:08:03.332305'
-      version: ''
-    iPhone:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-    XRQuest:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-  trunk_latest_public:
-    Android:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-    Linux:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-    OSX:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-    Win:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-    iPhone:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-    XRQuest:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-  trunk_staging:
-    Android:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-    Linux:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-    OSX:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-    Win:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-    iPhone:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
-    XRQuest:
-      revision: b5c81da9dae099c1577789936e19e2a6c3fb961e
-      updated_at: '2021-04-25 13:33:54.600865'
-      version: ''
+trunk:
+  updated_at_UTC: '2021-05-02 23:07:20.933766'
+  changeset:
+    id: a2a2b9196a1f9517909ce418a2d60ae7a1cb62b4
+    date: '2021-05-02T15:50:08'