Skip to content

Commit 03cd89b

Browse files
PaulDemeulenaerePaulDemeulenaere
committed
Merge branch 'master' into urp/vfx/factorize-template-to-ease-sg-support
# Conflicts: # com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteCustomLitSubTarget.cs # com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteLitSubTarget.cs # com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteUnlitSubTarget.cs
2 parents d3ec70a + 9fd657c commit 03cd89b

File tree

2,283 files changed

+214190
-45696
lines changed

Some content is hidden

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

2,283 files changed

+214190
-45696
lines changed

‎.github/pr-commenter.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,43 @@ comment:
1616
- TestProjects/HDRP*/**/*
1717
body: |
1818
**HDRP**
19-
`/.yamato%252Fall-hdrp.yml%2523PR_HDRP_2021.2`
19+
`/.yamato%252Fall-hdrp.yml%2523PR_HDRP_trunk`
20+
With changes to HDRP packages, you should also run
21+
`/.yamato%252Fall-lightmapper.yml%2523PR_LightMapper_trunk`
2022
- id: URP
2123
files:
2224
- com.unity.render-pipelines.universal/**/*
2325
- com.unity.testing.urp/**/*
2426
- TestProjects/Universal*/**/*
2527
body: |
2628
**URP**
27-
`/.yamato%252Fall-urp.yml%2523PR_URP_2021.2`
29+
`/.yamato%252Fall-urp.yml%2523PR_URP_trunk`
30+
With changes to URP packages, you should also run
31+
`/.yamato%252Fall-lightmapper.yml%2523PR_LightMapper_trunk`
2832
- id: ShaderGraph
2933
files:
3034
- com.unity.shadergraph/**/*
3135
- TestProjects/ShaderGraph*/**/*
3236
- com.unity.render-pipelines.universal/Editor/ShaderGraph/*
3337
body: |
3438
**Shader Graph**
35-
`/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_2021.2`
39+
`/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_trunk`
3640
Depending on your PR, you may also want
37-
`/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_2021.2`
38-
`/.yamato%252Fall-shadergraph_builtin_lighting.yml%2523PR_ShaderGraph_BuiltIn_Lighting_2021.2`
41+
`/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_trunk`
42+
`/.yamato%252Fall-shadergraph_builtin_lighting.yml%2523PR_ShaderGraph_BuiltIn_Lighting_trunk`
3943
- id: VFX
4044
files:
4145
- com.unity.visualeffectgraph/**/*
4246
- com.unity.testing.visualeffectgraph/**/*
4347
- TestProjects/VisualEffectGraph*/**/*
4448
body: |
4549
**VFX**
46-
`/.yamato%252Fall-vfx.yml%2523PR_VFX_2021.2`
50+
`/.yamato%252Fall-vfx.yml%2523PR_VFX_trunk`
4751
- id: Core
4852
files:
4953
- com.unity.render-pipelines.core/**/*
5054
body: |
5155
**SRP Core**
5256
You could run ABV on your branch before merging your PR, but it will start A LOT of jobs. Please be responsible about it and run it only when you feel the PR is ready:
53-
`/.yamato%252F_abv.yml%2523all_project_ci_2021.2`
57+
`/.yamato%252F_abv.yml%2523all_project_ci_trunk`
5458
Be aware that any modifications to the Core package impacts everyone in the Graphics repo so please discuss the PR with your lead.

‎.github/workflows/draft.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ jobs:
99
runs-on: ubuntu-latest
1010
if: github.event.pull_request.draft == false && github.event.pull_request.ready_for_review == false
1111
steps:
12-
- uses: thollander/actions-comment-pull-request@master
13-
with:
14-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15-
message: |
16-
It appears that you made a non-draft PR!
17-
Please convert your PR to draft (button on the right side of the page).
18-
See the PR template for more information.
19-
Thank you!
12+
- uses: thollander/actions-comment-pull-request@v1.0.4
13+
with:
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
message: |
16+
It appears that you made a non-draft PR!
17+
Please convert your PR to draft (button on the right side of the page).
18+
See the PR template for more information.
19+
Thank you!

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ node_modules
4747
manifest-updater.py
4848
TestProjects/UniversalGraphicsTest_Lighting/UserSettings/EditorUserSettings.asset
4949
TestProjects/UniversalGraphicsTest_Lighting/Packages/packages-lock.json
50+
com.unity.template-hd/InitCodeMarker

‎.yamato/_abv.yml

Lines changed: 4 additions & 151 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# Read more under .yamato/docs/readme.md
55

66
{% metadata_file .yamato/_cache_config.metafile -%}
7-
{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%}
87
{% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%}
98

109
---
@@ -29,24 +28,6 @@ all_project_ci_trunk:
2928
rerun: on_new_revision
3029
all_project_ci_nightly_trunk:
3130
name: Nightly on trunk
32-
variables:
33-
CUSTOM_REVISION: '{{trunk.changeset.id}}'
34-
UTR_VERSION: "current"
35-
TEST_FILTER: .*
36-
CACHE_ARGS: '{{cache.flags}}'
37-
dependencies:
38-
- path: .yamato/all-hdrp.yml#Nightly_HDRP_trunk
39-
rerun: on_new_revision
40-
- path: .yamato/all-vfx.yml#Nightly_VFX_trunk
41-
rerun: on_new_revision
42-
- path: .yamato/all-urp.yml#Nightly_URP_trunk
43-
rerun: on_new_revision
44-
- path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_trunk
45-
rerun: on_new_revision
46-
- path: .yamato/_abv.yml#General_Checks_trunk
47-
rerun: on_new_revision
48-
all_project_ci_trunk_weekly_trunk:
49-
name: Trunk Weekly on trunk
5031
variables:
5132
CUSTOM_REVISION: '{{trunk.changeset.id}}'
5233
UTR_VERSION: "current"
@@ -55,7 +36,7 @@ all_project_ci_trunk_weekly_trunk:
5536
triggers:
5637
recurring:
5738
- branch: master
58-
frequency: weekly
39+
frequency: 1 * * ?
5940
dependencies:
6041
- path: .yamato/all-hdrp.yml#Nightly_HDRP_trunk
6142
rerun: on_new_revision
@@ -65,6 +46,8 @@ all_project_ci_trunk_weekly_trunk:
6546
rerun: on_new_revision
6647
- path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_trunk
6748
rerun: on_new_revision
49+
- path: .yamato/all-lightmapper.yml#LightMapper_trunk
50+
rerun: on_new_revision
6851
- path: .yamato/_abv.yml#General_Checks_trunk
6952
rerun: on_new_revision
7053
General_Checks_trunk:
@@ -123,120 +106,6 @@ Trunk_verification_trunk:
123106
rerun: on_new_revision
124107
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_trunk
125108
rerun: on_new_revision
126-
all_project_ci_2021.2:
127-
name: ABV (all PR jobs) on 2021.2
128-
variables:
129-
CUSTOM_REVISION: '{{2021_2.changeset.id}}'
130-
UTR_VERSION: "current"
131-
TEST_FILTER: .*
132-
CACHE_ARGS: '{{cache.flags}}'
133-
dependencies:
134-
- path: .yamato/all-hdrp.yml#PR_HDRP_2021.2
135-
rerun: on_new_revision
136-
- path: .yamato/all-vfx.yml#PR_VFX_2021.2
137-
rerun: on_new_revision
138-
- path: .yamato/all-urp.yml#PR_URP_2021.2
139-
rerun: on_new_revision
140-
- path: .yamato/all-shadergraph.yml#PR_ShaderGraph_2021.2
141-
rerun: on_new_revision
142-
- path: .yamato/_abv.yml#General_Checks_2021.2
143-
rerun: on_new_revision
144-
all_project_ci_nightly_2021.2:
145-
name: Nightly on 2021.2
146-
variables:
147-
CUSTOM_REVISION: '{{2021_2.changeset.id}}'
148-
UTR_VERSION: "current"
149-
TEST_FILTER: .*
150-
CACHE_ARGS: '{{cache.flags}}'
151-
triggers:
152-
recurring:
153-
- branch: master
154-
frequency: 1 * * ?
155-
dependencies:
156-
- path: .yamato/all-hdrp.yml#Nightly_HDRP_2021.2
157-
rerun: on_new_revision
158-
- path: .yamato/all-vfx.yml#Nightly_VFX_2021.2
159-
rerun: on_new_revision
160-
- path: .yamato/all-urp.yml#Nightly_URP_2021.2
161-
rerun: on_new_revision
162-
- path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_2021.2
163-
rerun: on_new_revision
164-
- path: .yamato/_abv.yml#General_Checks_2021.2
165-
rerun: on_new_revision
166-
all_project_ci_trunk_weekly_2021.2:
167-
name: Trunk Weekly on 2021.2
168-
variables:
169-
CUSTOM_REVISION: '{{2021_2.changeset.id}}'
170-
UTR_VERSION: "current"
171-
TEST_FILTER: .*
172-
CACHE_ARGS: '{{cache.flags}}'
173-
dependencies:
174-
- path: .yamato/all-hdrp.yml#Nightly_HDRP_2021.2
175-
rerun: on_new_revision
176-
- path: .yamato/all-vfx.yml#Nightly_VFX_2021.2
177-
rerun: on_new_revision
178-
- path: .yamato/all-urp.yml#Nightly_URP_2021.2
179-
rerun: on_new_revision
180-
- path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_2021.2
181-
rerun: on_new_revision
182-
- path: .yamato/_abv.yml#General_Checks_2021.2
183-
rerun: on_new_revision
184-
General_Checks_2021.2:
185-
name: General Checks on 2021.2
186-
variables:
187-
CUSTOM_REVISION: '{{2021_2.changeset.id}}'
188-
UTR_VERSION: "current"
189-
TEST_FILTER: .*
190-
CACHE_ARGS: '{{cache.flags}}'
191-
dependencies:
192-
- path: .yamato/_projectcontext.yml#all_package_ci_project_2021.2
193-
rerun: on_new_revision
194-
- path: .yamato/_formatting.yml#formatting
195-
rerun: on_new_revision
196-
- path: .yamato/all-smoke_test.yml#Smoke_Test_2021.2
197-
rerun: on_new_revision
198-
Trunk_verification_2021.2:
199-
name: Trunk verification on 2021.2
200-
variables:
201-
CUSTOM_REVISION: '{{2021_2.changeset.id}}'
202-
UTR_VERSION: "current"
203-
TEST_FILTER: .*
204-
CACHE_ARGS: '{{cache.flags}}'
205-
dependencies:
206-
- path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_playmode_mono_Linear_2021.2
207-
rerun: on_new_revision
208-
- path: .yamato/urp_2d-win-dx11.yml#URP_2D_Win_DX11_editmode_mono_Linear_2021.2
209-
rerun: on_new_revision
210-
- path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_playmode_mono_Linear_2021.2
211-
rerun: on_new_revision
212-
- path: .yamato/urp_foundation-win-dx11.yml#URP_Foundation_Win_DX11_editmode_mono_Linear_2021.2
213-
rerun: on_new_revision
214-
- path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_playmode_mono_Linear_2021.2
215-
rerun: on_new_revision
216-
- path: .yamato/urp_lighting-win-dx11.yml#URP_Lighting_Win_DX11_editmode_mono_Linear_2021.2
217-
rerun: on_new_revision
218-
- path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_playmode_mono_Linear_2021.2
219-
rerun: on_new_revision
220-
- path: .yamato/urp_postpro-win-dx11.yml#URP_PostPro_Win_DX11_editmode_mono_Linear_2021.2
221-
rerun: on_new_revision
222-
- path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_playmode_mono_Linear_2021.2
223-
rerun: on_new_revision
224-
- path: .yamato/urp_terrain-win-dx11.yml#URP_Terrain_Win_DX11_editmode_mono_Linear_2021.2
225-
rerun: on_new_revision
226-
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_playmode_mono_Linear_2021.2
227-
rerun: on_new_revision
228-
- path: .yamato/shadergraph-win-dx11.yml#ShaderGraph_Win_DX11_editmode_mono_Linear_2021.2
229-
rerun: on_new_revision
230-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_playmode_mono_Linear_2021.2
231-
rerun: on_new_revision
232-
- path: .yamato/hdrp-win-dx11.yml#HDRP_Win_DX11_editmode_mono_Linear_2021.2
233-
rerun: on_new_revision
234-
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_playmode_mono_Linear_2021.2
235-
rerun: on_new_revision
236-
- path: .yamato/vfx_hdrp-win-dx11.yml#VFX_HDRP_Win_DX11_editmode_mono_Linear_2021.2
237-
rerun: on_new_revision
238-
- path: .yamato/vfx_urp-win-dx11.yml#VFX_URP_Win_DX11_playmode_mono_Linear_2021.2
239-
rerun: on_new_revision
240109
all_project_ci_CUSTOM-REVISION:
241110
name: ABV (all PR jobs) on CUSTOM-REVISION
242111
variables:
@@ -271,23 +140,7 @@ all_project_ci_nightly_CUSTOM-REVISION:
271140
rerun: on_new_revision
272141
- path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_CUSTOM-REVISION
273142
rerun: on_new_revision
274-
- path: .yamato/_abv.yml#General_Checks_CUSTOM-REVISION
275-
rerun: on_new_revision
276-
all_project_ci_trunk_weekly_CUSTOM-REVISION:
277-
name: Trunk Weekly on CUSTOM-REVISION
278-
variables:
279-
CUSTOM_REVISION: custom_revision_not_set
280-
UTR_VERSION: "current"
281-
TEST_FILTER: .*
282-
CACHE_ARGS: '{{cache.flags}}'
283-
dependencies:
284-
- path: .yamato/all-hdrp.yml#Nightly_HDRP_CUSTOM-REVISION
285-
rerun: on_new_revision
286-
- path: .yamato/all-vfx.yml#Nightly_VFX_CUSTOM-REVISION
287-
rerun: on_new_revision
288-
- path: .yamato/all-urp.yml#Nightly_URP_CUSTOM-REVISION
289-
rerun: on_new_revision
290-
- path: .yamato/all-shadergraph.yml#Nightly_ShaderGraph_CUSTOM-REVISION
143+
- path: .yamato/all-lightmapper.yml#LightMapper_CUSTOM-REVISION
291144
rerun: on_new_revision
292145
- path: .yamato/_abv.yml#General_Checks_CUSTOM-REVISION
293146
rerun: on_new_revision

‎.yamato/_editor_pinning.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
# Read more under .yamato/docs/readme.md
55

66
{% metadata_file .yamato/_cache_config.metafile -%}
7-
{% metadata_file .yamato/_latest_editor_versions_2021.2.metafile -%}
87
{% metadata_file .yamato/_latest_editor_versions_trunk.metafile -%}
98

109
---
@@ -28,8 +27,7 @@ editor-pinning-update:
2827
- git config --global user.name "noreply@unity3d.com"
2928
- git config --global user.email "noreply@unity3d.com"
3029
- git checkout $GIT_BRANCH
31-
- python3 .yamato/script/editor_scripts/update_revisions.py --track trunk --ono-branch $ONO_BRANCH_TRUNK --api-key $ONO_API_KEY --commit-and-push --nr-commits-to-retrieve 1
32-
- python3 .yamato/script/editor_scripts/update_revisions.py --track 2021.2 --ono-branch $ONO_BRANCH_2021_2 --api-key $ONO_API_KEY --commit-and-push --nr-commits-to-retrieve 100
30+
- python3 .yamato/script/editor_scripts/update_revisions.py --track trunk --ono-branch $ONO_BRANCH_TRUNK --api-key $ONO_API_KEY --commit-and-push --nr-commits-to-retrieve 100
3331
triggers:
3432
recurring:
3533
- branch: master

0 commit comments

Comments
 (0)