Skip to content

Commit 9d6e6d0

Browse files
PaulDemeulenaerePaulDemeulenaere
committed
Merge branch 'master' into vfx/staging
# Conflicts: # TestProjects/HDRP_DXR_Tests/Assets/Scenes/901_Materials_HDRP_Variants/Tesselation.meta # com.unity.visualeffectgraph/CHANGELOG.md
2 parents f940a32 + a7d5e88 commit 9d6e6d0

File tree

820 files changed

+79562
-22300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

820 files changed

+79562
-22300
lines changed

‎.yamato/_green_job_revisions_trunk.metafile‎

Lines changed: 54 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -6,68 +6,68 @@ nightly_shadergraph_-_trunk:
66
id: 961bbd167d68a1b4f85e1702a4cd6152ac9b7660
77
date: '2021-05-12T22:20:13'
88
shadergraph_pr_job_-_trunk:
9-
updated_at: '2021-05-13 07:37:04.885681'
9+
updated_at: '2021-06-01 07:58:21.518912'
1010
last_green_revisions:
11-
updated_at_UTC: '2021-05-12 23:22:52.180460'
11+
updated_at_UTC: '2021-05-29 23:30:03.226346'
1212
changeset:
13-
id: 961bbd167d68a1b4f85e1702a4cd6152ac9b7660
14-
date: '2021-05-12T22:20:13'
13+
id: 8a8461d21d26fb82770ba70206cfb32fa7897895
14+
date: '2021-05-29T21:04:42'
1515
vfx_urp_pr_job_-_trunk:
16-
updated_at: '2021-05-20 07:24:09.626458'
16+
updated_at: '2021-06-01 07:58:21.518912'
1717
last_green_revisions:
18-
updated_at_UTC: '2021-05-16 23:26:00.395251'
18+
updated_at_UTC: '2021-05-29 23:30:03.226346'
1919
changeset:
20-
id: 5605789000ce1782e51b3ba9117b468a6eda07b9
21-
date: '2021-05-16T09:07:00'
20+
id: 8a8461d21d26fb82770ba70206cfb32fa7897895
21+
date: '2021-05-29T21:04:42'
2222
vfx_hdrp_pr_job_-_trunk:
23-
updated_at: '2021-05-18 07:36:10.831586'
23+
updated_at: '2021-06-01 07:58:21.518912'
2424
last_green_revisions:
25-
updated_at_UTC: '2021-05-16 23:26:00.395251'
25+
updated_at_UTC: '2021-05-29 23:30:03.226346'
2626
changeset:
27-
id: 5605789000ce1782e51b3ba9117b468a6eda07b9
28-
date: '2021-05-16T09:07:00'
27+
id: 8a8461d21d26fb82770ba70206cfb32fa7897895
28+
date: '2021-05-29T21:04:42'
2929
nightly_vfx_urp_-_trunk:
30-
updated_at: '2021-05-20 07:24:09.626458'
30+
updated_at: '2021-06-01 07:58:21.518912'
3131
last_green_revisions:
32-
updated_at_UTC: '2021-05-16 23:26:00.395251'
32+
updated_at_UTC: '2021-05-29 23:30:03.226346'
3333
changeset:
34-
id: 5605789000ce1782e51b3ba9117b468a6eda07b9
35-
date: '2021-05-16T09:07:00'
34+
id: 8a8461d21d26fb82770ba70206cfb32fa7897895
35+
date: '2021-05-29T21:04:42'
3636
nightly_vfx_hdrp_-_trunk:
37-
updated_at: '2021-05-16 07:35:58.935562'
37+
updated_at: '2021-06-01 07:58:21.518912'
3838
last_green_revisions:
39-
updated_at_UTC: '2021-05-14 23:23:21.212494'
39+
updated_at_UTC: '2021-05-29 23:30:03.226346'
4040
changeset:
41-
id: 9ca08391182375d75c36f17ee52c744537526532
42-
date: '2021-05-14T14:53:42'
41+
id: 8a8461d21d26fb82770ba70206cfb32fa7897895
42+
date: '2021-05-29T21:04:42'
4343
nightly_urp_2d_-_trunk:
44-
updated_at: '2021-05-15 07:36:57.741811'
44+
updated_at: '2021-05-27 07:30:02.696114'
4545
last_green_revisions:
46-
updated_at_UTC: '2021-05-14 23:23:21.212494'
46+
updated_at_UTC: '2021-05-24 23:16:31.775135'
4747
changeset:
48-
id: 9ca08391182375d75c36f17ee52c744537526532
49-
date: '2021-05-14T14:53:42'
48+
id: 5e2b604c1ee94847b423cef80f0f4ac55bb70027
49+
date: '2021-05-24T14:21:52'
5050
urp_2d_pr_job_-_trunk:
51-
updated_at: '2021-05-15 07:36:57.741811'
51+
updated_at: '2021-06-01 07:58:21.518912'
5252
last_green_revisions:
53-
updated_at_UTC: '2021-05-14 23:23:21.212494'
53+
updated_at_UTC: '2021-05-29 23:30:03.226346'
5454
changeset:
55-
id: 9ca08391182375d75c36f17ee52c744537526532
56-
date: '2021-05-14T14:53:42'
55+
id: 8a8461d21d26fb82770ba70206cfb32fa7897895
56+
date: '2021-05-29T21:04:42'
5757
nightly_urp_postpro_-_trunk:
58-
updated_at: '2021-05-16 07:35:58.935562'
58+
updated_at: '2021-05-25 07:12:58.500646'
5959
last_green_revisions:
60-
updated_at_UTC: '2021-05-14 23:23:21.212494'
60+
updated_at_UTC: '2021-05-24 23:16:31.775135'
6161
changeset:
62-
id: 9ca08391182375d75c36f17ee52c744537526532
63-
date: '2021-05-14T14:53:42'
62+
id: 5e2b604c1ee94847b423cef80f0f4ac55bb70027
63+
date: '2021-05-24T14:21:52'
6464
urp_postpro_pr_job_-_trunk:
65-
updated_at: '2021-05-16 07:35:58.935562'
65+
updated_at: '2021-06-01 07:58:21.518912'
6666
last_green_revisions:
67-
updated_at_UTC: '2021-05-14 23:23:21.212494'
67+
updated_at_UTC: '2021-05-29 23:30:03.226346'
6868
changeset:
69-
id: 9ca08391182375d75c36f17ee52c744537526532
70-
date: '2021-05-14T14:53:42'
69+
id: 8a8461d21d26fb82770ba70206cfb32fa7897895
70+
date: '2021-05-29T21:04:42'
7171
nightly_urp_terrain_-_trunk:
7272
updated_at: '2021-04-20 07:31:59.616263'
7373
last_green_revisions:
@@ -92,28 +92,12 @@ nightly_urp_terrain_-_trunk:
9292
updated_at: '2021-04-20 00:03:29.618902'
9393
version: ''
9494
urp_terrain_pr_job_-_trunk:
95-
updated_at: '2021-04-20 07:31:59.616263'
95+
updated_at: '2021-06-01 07:58:21.518912'
9696
last_green_revisions:
97-
Android:
98-
revision: af5e3dc5f881b280e7d10f087ed1ba843d269eb5
99-
updated_at: '2021-04-18 23:32:58.196701'
100-
version: ''
101-
Linux:
102-
revision: af5e3dc5f881b280e7d10f087ed1ba843d269eb5
103-
updated_at: '2021-04-20 00:03:29.618902'
104-
version: ''
105-
OSX:
106-
revision: af5e3dc5f881b280e7d10f087ed1ba843d269eb5
107-
updated_at: '2021-04-20 00:03:29.618902'
108-
version: ''
109-
Win:
110-
revision: af5e3dc5f881b280e7d10f087ed1ba843d269eb5
111-
updated_at: '2021-04-20 00:03:29.618902'
112-
version: ''
113-
iPhone:
114-
revision: af5e3dc5f881b280e7d10f087ed1ba843d269eb5
115-
updated_at: '2021-04-20 00:03:29.618902'
116-
version: ''
97+
updated_at_UTC: '2021-05-29 23:30:03.226346'
98+
changeset:
99+
id: 8a8461d21d26fb82770ba70206cfb32fa7897895
100+
date: '2021-05-29T21:04:42'
117101
nightly_urp_foundation_-_trunk:
118102
updated_at: '2021-04-19 07:08:55.311189'
119103
last_green_revisions:
@@ -138,12 +122,12 @@ nightly_urp_foundation_-_trunk:
138122
updated_at: '2021-04-14 23:25:07.773558'
139123
version: ''
140124
urp_foundation_pr_job_-_trunk:
141-
updated_at: '2021-05-11 07:14:36.100595'
125+
updated_at: '2021-06-01 07:58:21.518912'
142126
last_green_revisions:
143-
updated_at_UTC: '2021-05-11 00:06:27.751213'
127+
updated_at_UTC: '2021-05-29 23:30:03.226346'
144128
changeset:
145-
id: 65cb2e8a581405a9cda317fbf2e7afa2971088aa
146-
date: '2021-05-10T15:28:10'
129+
id: 8a8461d21d26fb82770ba70206cfb32fa7897895
130+
date: '2021-05-29T21:04:42'
147131
nightly_urp_lighting_-_trunk:
148132
updated_at: '2021-04-15 08:11:49.694708'
149133
last_green_revisions:
@@ -168,32 +152,16 @@ nightly_urp_lighting_-_trunk:
168152
updated_at: '2021-04-14 23:25:07.773558'
169153
version: ''
170154
urp_lighting_pr_job_-_trunk:
171-
updated_at: '2021-04-19 07:08:55.311189'
155+
updated_at: '2021-05-28 07:29:59.869296'
172156
last_green_revisions:
173-
Android:
174-
revision: af5e3dc5f881b280e7d10f087ed1ba843d269eb5
175-
updated_at: '2021-04-18 23:32:58.196701'
176-
version: ''
177-
Linux:
178-
revision: 462ae11b66db6167774e39fa34260d29dbc951ed
179-
updated_at: '2021-04-16 09:22:51.092647'
180-
version: ''
181-
OSX:
182-
revision: 462ae11b66db6167774e39fa34260d29dbc951ed
183-
updated_at: '2021-04-16 09:22:51.092647'
184-
version: ''
185-
Win:
186-
revision: 462ae11b66db6167774e39fa34260d29dbc951ed
187-
updated_at: '2021-04-16 09:22:51.092647'
188-
version: ''
189-
iPhone:
190-
revision: 462ae11b66db6167774e39fa34260d29dbc951ed
191-
updated_at: '2021-04-14 23:25:07.773558'
192-
version: ''
157+
updated_at_UTC: '2021-05-27 23:29:28.201615'
158+
changeset:
159+
id: c7b813f0d5d53ed851dd3f6488f1e5b14f9e255d
160+
date: '2021-05-27T21:32:01'
193161
hdrp_pr_job_-_trunk:
194-
updated_at: '2021-05-13 07:37:04.885681'
162+
updated_at: '2021-06-01 07:58:21.518912'
195163
last_green_revisions:
196-
updated_at_UTC: '2021-05-12 23:22:52.180460'
164+
updated_at_UTC: '2021-05-29 23:30:03.226346'
197165
changeset:
198-
id: 961bbd167d68a1b4f85e1702a4cd6152ac9b7660
199-
date: '2021-05-12T22:20:13'
166+
id: 8a8461d21d26fb82770ba70206cfb32fa7897895
167+
date: '2021-05-29T21:04:42'

‎.yamato/_latest_editor_versions_trunk.metafile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
trunk:
2-
updated_at_UTC: '2021-05-20 15:53:00.916450'
2+
updated_at_UTC: '2021-05-29 23:30:03.226346'
33
changeset:
4-
id: 281d883a3da809b5684d799dea25486c92813302
5-
date: '2021-05-20T07:03:32'
4+
id: 8a8461d21d26fb82770ba70206cfb32fa7897895
5+
date: '2021-05-29T21:04:42'

‎.yamato/_projectcontext.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,9 @@ all_package_ci_project_CUSTOM-REVISION:
366366
flavor: b1.large
367367
dependencies:
368368
- .yamato/_projectcontext.yml#test_all_project_Win_CUSTOM-REVISION
369+
- .yamato/_projectcontext.yml#test_all_project_Win_min_editor
369370
- .yamato/_projectcontext.yml#test_all_project_OSX_CUSTOM-REVISION
371+
- .yamato/_projectcontext.yml#test_all_project_OSX_min_editor
370372
variables:
371373
CUSTOM_REVISION: custom_revision_not_set
372374
commands:

‎.yamato/all-hdrp.yml‎

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,10 @@ PR_HDRP_trunk:
1313
dependencies:
1414
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_cache_mono_Linear_trunk
1515
rerun: on_new_revision
16-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_cache_mono_Linear_trunk
17-
rerun: on_new_revision
18-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_cache_mono_Linear_trunk
19-
rerun: on_new_revision
20-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_trunk
21-
rerun: on_new_revision
22-
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_cache_mono_Linear_trunk
23-
rerun: on_new_revision
24-
- path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_cache_mono_Linear_trunk
25-
rerun: on_new_revision
26-
- path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_playmode_cache_mono_Linear_trunk
27-
rerun: on_new_revision
28-
- path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_cache_mono_Linear_trunk
29-
rerun: on_new_revision
30-
- path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_playmode_cache_mono_Linear_trunk
31-
rerun: on_new_revision
32-
- path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_trunk
33-
rerun: on_new_revision
3416
- path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_trunk
3517
rerun: on_new_revision
18+
triggers:
19+
expression: pull_request.target eq "master" AND NOT pull_request.draft AND pull_request.changes.any match ["com.unity.render-pipelines.high-definition/**/*", "com.unity.render-pipelines.high-definition-config/**/*", "TestProjects/HDRP_Tests/**/*"] AND NOT pull_request.changes.all match ["*.md", "**/*.md", "doc/**/*", "**/Documentation*/**/*"]
3620
variables:
3721
CUSTOM_REVISION: '{{trunk.changeset.id}}'
3822
UTR_VERSION: "current"
@@ -62,32 +46,32 @@ Nightly_HDRP_trunk:
6246
rerun: on_new_revision
6347
- path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_Standalone_cache_mono_Linear_trunk
6448
rerun: on_new_revision
65-
variables:
66-
CUSTOM_REVISION: '{{trunk.changeset.id}}'
67-
UTR_VERSION: "current"
68-
TEST_FILTER: .*
69-
PR_HDRP_CUSTOM-REVISION:
70-
name: HDRP PR Job - CUSTOM-REVISION
71-
dependencies:
72-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_cache_mono_Linear_CUSTOM-REVISION
49+
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_cache_mono_Linear_trunk
7350
rerun: on_new_revision
74-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_cache_mono_Linear_CUSTOM-REVISION
51+
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_cache_mono_Linear_trunk
7552
rerun: on_new_revision
76-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_cache_mono_Linear_CUSTOM-REVISION
53+
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_trunk
7754
rerun: on_new_revision
78-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
55+
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_cache_mono_Linear_trunk
7956
rerun: on_new_revision
80-
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_cache_mono_Linear_CUSTOM-REVISION
57+
- path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_cache_mono_Linear_trunk
8158
rerun: on_new_revision
82-
- path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION
59+
- path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_playmode_cache_mono_Linear_trunk
8360
rerun: on_new_revision
84-
- path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_playmode_cache_mono_Linear_CUSTOM-REVISION
61+
- path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_cache_mono_Linear_trunk
8562
rerun: on_new_revision
86-
- path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION
63+
- path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_playmode_cache_mono_Linear_trunk
8764
rerun: on_new_revision
88-
- path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION
65+
- path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_trunk
8966
rerun: on_new_revision
90-
- path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_CUSTOM-REVISION
67+
variables:
68+
CUSTOM_REVISION: '{{trunk.changeset.id}}'
69+
UTR_VERSION: "current"
70+
TEST_FILTER: .*
71+
PR_HDRP_CUSTOM-REVISION:
72+
name: HDRP PR Job - CUSTOM-REVISION
73+
dependencies:
74+
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_Standalone_cache_mono_Linear_CUSTOM-REVISION
9175
rerun: on_new_revision
9276
- path: .yamato/all-vfx_hdrp.yml#PR_VFX_HDRP_CUSTOM-REVISION
9377
rerun: on_new_revision
@@ -120,6 +104,24 @@ Nightly_HDRP_CUSTOM-REVISION:
120104
rerun: on_new_revision
121105
- path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_Standalone_cache_mono_Linear_CUSTOM-REVISION
122106
rerun: on_new_revision
107+
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_cache_mono_Linear_CUSTOM-REVISION
108+
rerun: on_new_revision
109+
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_XR_cache_mono_Linear_CUSTOM-REVISION
110+
rerun: on_new_revision
111+
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_CUSTOM-REVISION
112+
rerun: on_new_revision
113+
- path: .yamato/hdrp-win-dx12.yml#HDRP_Win_DX12_playmode_cache_mono_Linear_CUSTOM-REVISION
114+
rerun: on_new_revision
115+
- path: .yamato/hdrp-win-vulkan.yml#HDRP_Win_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION
116+
rerun: on_new_revision
117+
- path: .yamato/hdrp-osx-metal.yml#HDRP_OSX_Metal_playmode_cache_mono_Linear_CUSTOM-REVISION
118+
rerun: on_new_revision
119+
- path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_Standalone_cache_mono_Linear_CUSTOM-REVISION
120+
rerun: on_new_revision
121+
- path: .yamato/hdrp-linux-vulkan.yml#HDRP_Linux_Vulkan_playmode_cache_mono_Linear_CUSTOM-REVISION
122+
rerun: on_new_revision
123+
- path: .yamato/all-hdrp_dxr.yml#PR_HDRP_DXR_CUSTOM-REVISION
124+
rerun: on_new_revision
123125
variables:
124126
CUSTOM_REVISION: custom_revision_not_set
125127
UTR_VERSION: "current"

0 commit comments

Comments
 (0)