Skip to content

Commit 243a57a

Browse files
skerysskerys
committed
Merged master
1 parent 9810372 commit 243a57a

File tree

252 files changed

+19617
-4911
lines changed

Some content is hidden

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

252 files changed

+19617
-4911
lines changed

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 35 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,42 @@
1-
**Guide** : https://github.com/Unity-Technologies/Graphics/blob/master/.github/pr-read.png.md
1+
### **Please read**
2+
**PR workflow guidelines**
3+
* SRP ABV will start automatically on Yamato when you open your PR
4+
* Changes to docs and md files will **not** trigger ABV jobs
5+
* Consider making use of **draft PRs** if you are not 100% sure that your PR is ready for review
6+
* ABV will restart if you add a new commit to a branch with an open PR (hence why you should consider using draft PRs)
7+
* Adding [skip ci] (case insensitive) to the title of PRs will stop any jobs being trigger automatically - you will need to open Yamato and find your branch to run ABV
8+
* You can also add [skip ci] to commit messages to prevent CI from running on that push
9+
* Add [cancel old ci] to your commit message if you've made changes you want to test and no longer need the previous jobs
210

3-
**Display Addon** : https://userstyles.org/styles/182991/unity-graphics-pr-readme
11+
### Checklist for PR maker
12+
- [ ] Have you added a backport label (if needed)? For example, the `need-backport-*` label. After you backport the PR, the label changes to `backported-*`.
13+
- [ ] Have you updated the changelog? Each package has a `CHANGELOG.md` file.
14+
- [ ] Have you updated or added the documentation for your PR? When you add a new feature, change a property name, or change the behavior of a feature, it's best practice to include related documentation changes in the same PR.
15+
- [ ] Have you added a graphic test for your PR (if needed)? When you add a new feature, or discover a bug that tests don't cover, please add a graphic test.
416

5-
# Purpose of this PR
17+
---
18+
### Purpose of this PR
19+
Why is this PR needed, what hard problem is it solving/fixing?
620

7-
> Why is this PR needed, what hard problem is it solving/fixing?
21+
---
22+
### Testing status
823

9-
# Testing status
10-
## Manual Tests
11-
> What have you tested?
24+
**Manual Tests**: What did you do?
25+
- [ ] Opened test project + Run graphic tests locally
26+
- [ ] Built a player
27+
- [ ] Checked new UI names with UX convention
28+
- [ ] Tested UI multi-edition + Undo/Redo + Prefab overrides + Alignment in Preset
29+
- [ ] C# and shader warnings (supress shader cache to see them)
30+
- [ ] Checked new resources path for the reloader (in developer mode, you have a button at end of resources that check the paths)
31+
- Other:
1232

13-
## Automated Tests
14-
> What did you setup? (Add a screenshot or the reference image of the test please)
33+
**Automated Tests**: What did you setup? (Add a screenshot or the reference image of the test please)
1534

16-
## Links
17-
**Yamato**: (Select your branch) https://yamato.prd.cds.internal.unity3d.com/jobs/902-Graphics
18-
> Any test projects or documents to go with this to help reviewers?
35+
**Yamato**: (Select your branch):
36+
https://yamato.prd.cds.internal.unity3d.com/jobs/902-Graphics
1937

20-
# Comments to reviewers
21-
> Notes for the reviewers you have assigned.
38+
Any test projects to go with this to help reviewers?
39+
40+
---
41+
### Comments to reviewers
42+
Notes for the reviewers you have assigned.

‎.yamato/_abv.yml‎

Lines changed: 363 additions & 0 deletions
Large diffs are not rendered by default.

‎.yamato/_editor.yml‎

Lines changed: 275 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,275 @@
1+
editor:priming:trunk:macos:
2+
name: '[trunk,macos] Editor priming'
3+
agent:
4+
type: Unity::VM
5+
image: cds-ops/ubuntu-16.04-base:stable
6+
flavor: b1.small
7+
skip_checkout: true
8+
variables:
9+
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
10+
DISPLAY: ":0"
11+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
12+
commands:
13+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
14+
- unity-downloader-cli -u trunk -o macos --wait --skip-download -c editor -c il2cpp > unity_revision.txt
15+
artifacts:
16+
unity_revision.zip:
17+
paths:
18+
- "unity_revision.txt"
19+
editor:priming:fast-trunk:macos:
20+
name: '[fast-trunk,macos] Editor priming'
21+
agent:
22+
type: Unity::VM
23+
image: cds-ops/ubuntu-16.04-base:stable
24+
flavor: b1.small
25+
skip_checkout: true
26+
variables:
27+
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
28+
DISPLAY: ":0"
29+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
30+
commands:
31+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
32+
- unity-downloader-cli -u trunk --fast -o macos --wait --skip-download -c editor -c il2cpp > unity_revision.txt
33+
artifacts:
34+
unity_revision.zip:
35+
paths:
36+
- "unity_revision.txt"
37+
editor:priming:CUSTOM-REVISION:macos:
38+
name: '[CUSTOM-REVISION,macos] Editor priming'
39+
agent:
40+
type: Unity::VM
41+
image: cds-ops/ubuntu-16.04-base:stable
42+
flavor: b1.small
43+
skip_checkout: true
44+
variables:
45+
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
46+
DISPLAY: ":0"
47+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
48+
CUSTOM_REVISION: custom_revision_not_set
49+
commands:
50+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
51+
- unity-downloader-cli -u $CUSTOM_REVISION -o macos --wait --skip-download -c editor -c il2cpp > unity_revision.txt
52+
artifacts:
53+
unity_revision.zip:
54+
paths:
55+
- "unity_revision.txt"
56+
editor:priming:trunk:android:
57+
name: '[trunk,android] Editor priming'
58+
agent:
59+
type: Unity::VM
60+
image: cds-ops/ubuntu-16.04-base:stable
61+
flavor: b1.small
62+
skip_checkout: true
63+
variables:
64+
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
65+
DISPLAY: ":0"
66+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
67+
commands:
68+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
69+
- unity-downloader-cli -u trunk -o windows --wait --skip-download -c editor -c il2cpp -c android > unity_revision.txt
70+
artifacts:
71+
unity_revision.zip:
72+
paths:
73+
- "unity_revision.txt"
74+
editor:priming:fast-trunk:android:
75+
name: '[fast-trunk,android] Editor priming'
76+
agent:
77+
type: Unity::VM
78+
image: cds-ops/ubuntu-16.04-base:stable
79+
flavor: b1.small
80+
skip_checkout: true
81+
variables:
82+
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
83+
DISPLAY: ":0"
84+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
85+
commands:
86+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
87+
- unity-downloader-cli -u trunk --fast -o windows --wait --skip-download -c editor -c il2cpp -c android > unity_revision.txt
88+
artifacts:
89+
unity_revision.zip:
90+
paths:
91+
- "unity_revision.txt"
92+
editor:priming:CUSTOM-REVISION:android:
93+
name: '[CUSTOM-REVISION,android] Editor priming'
94+
agent:
95+
type: Unity::VM
96+
image: cds-ops/ubuntu-16.04-base:stable
97+
flavor: b1.small
98+
skip_checkout: true
99+
variables:
100+
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
101+
DISPLAY: ":0"
102+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
103+
CUSTOM_REVISION: custom_revision_not_set
104+
commands:
105+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
106+
- unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp -c android > unity_revision.txt
107+
artifacts:
108+
unity_revision.zip:
109+
paths:
110+
- "unity_revision.txt"
111+
editor:priming:trunk:windows:
112+
name: '[trunk,windows] Editor priming'
113+
agent:
114+
type: Unity::VM
115+
image: cds-ops/ubuntu-16.04-base:stable
116+
flavor: b1.small
117+
skip_checkout: true
118+
variables:
119+
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
120+
DISPLAY: ":0"
121+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
122+
commands:
123+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
124+
- unity-downloader-cli -u trunk -o windows --wait --skip-download -c editor -c il2cpp > unity_revision.txt
125+
artifacts:
126+
unity_revision.zip:
127+
paths:
128+
- "unity_revision.txt"
129+
editor:priming:fast-trunk:windows:
130+
name: '[fast-trunk,windows] Editor priming'
131+
agent:
132+
type: Unity::VM
133+
image: cds-ops/ubuntu-16.04-base:stable
134+
flavor: b1.small
135+
skip_checkout: true
136+
variables:
137+
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
138+
DISPLAY: ":0"
139+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
140+
commands:
141+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
142+
- unity-downloader-cli -u trunk --fast -o windows --wait --skip-download -c editor -c il2cpp > unity_revision.txt
143+
artifacts:
144+
unity_revision.zip:
145+
paths:
146+
- "unity_revision.txt"
147+
editor:priming:CUSTOM-REVISION:windows:
148+
name: '[CUSTOM-REVISION,windows] Editor priming'
149+
agent:
150+
type: Unity::VM
151+
image: cds-ops/ubuntu-16.04-base:stable
152+
flavor: b1.small
153+
skip_checkout: true
154+
variables:
155+
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
156+
DISPLAY: ":0"
157+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
158+
CUSTOM_REVISION: custom_revision_not_set
159+
commands:
160+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
161+
- unity-downloader-cli -u $CUSTOM_REVISION -o windows --wait --skip-download -c editor -c il2cpp > unity_revision.txt
162+
artifacts:
163+
unity_revision.zip:
164+
paths:
165+
- "unity_revision.txt"
166+
editor:priming:trunk:linux:
167+
name: '[trunk,linux] Editor priming'
168+
agent:
169+
type: Unity::VM
170+
image: cds-ops/ubuntu-16.04-base:stable
171+
flavor: b1.small
172+
skip_checkout: true
173+
variables:
174+
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
175+
DISPLAY: ":0"
176+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
177+
commands:
178+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
179+
- unity-downloader-cli -u trunk -o linux --wait --skip-download -c editor -c il2cpp > unity_revision.txt
180+
artifacts:
181+
unity_revision.zip:
182+
paths:
183+
- "unity_revision.txt"
184+
editor:priming:fast-trunk:linux:
185+
name: '[fast-trunk,linux] Editor priming'
186+
agent:
187+
type: Unity::VM
188+
image: cds-ops/ubuntu-16.04-base:stable
189+
flavor: b1.small
190+
skip_checkout: true
191+
variables:
192+
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
193+
DISPLAY: ":0"
194+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
195+
commands:
196+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
197+
- unity-downloader-cli -u trunk --fast -o linux --wait --skip-download -c editor -c il2cpp > unity_revision.txt
198+
artifacts:
199+
unity_revision.zip:
200+
paths:
201+
- "unity_revision.txt"
202+
editor:priming:CUSTOM-REVISION:linux:
203+
name: '[CUSTOM-REVISION,linux] Editor priming'
204+
agent:
205+
type: Unity::VM
206+
image: cds-ops/ubuntu-16.04-base:stable
207+
flavor: b1.small
208+
skip_checkout: true
209+
variables:
210+
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
211+
DISPLAY: ":0"
212+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
213+
CUSTOM_REVISION: custom_revision_not_set
214+
commands:
215+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
216+
- unity-downloader-cli -u $CUSTOM_REVISION -o linux --wait --skip-download -c editor -c il2cpp > unity_revision.txt
217+
artifacts:
218+
unity_revision.zip:
219+
paths:
220+
- "unity_revision.txt"
221+
editor:priming:trunk:ios:
222+
name: '[trunk,ios] Editor priming'
223+
agent:
224+
type: Unity::VM
225+
image: cds-ops/ubuntu-16.04-base:stable
226+
flavor: b1.small
227+
skip_checkout: true
228+
variables:
229+
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
230+
DISPLAY: ":0"
231+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
232+
commands:
233+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
234+
- unity-downloader-cli -u trunk -o macos --wait --skip-download -c editor -c iOS > unity_revision.txt
235+
artifacts:
236+
unity_revision.zip:
237+
paths:
238+
- "unity_revision.txt"
239+
editor:priming:fast-trunk:ios:
240+
name: '[fast-trunk,ios] Editor priming'
241+
agent:
242+
type: Unity::VM
243+
image: cds-ops/ubuntu-16.04-base:stable
244+
flavor: b1.small
245+
skip_checkout: true
246+
variables:
247+
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
248+
DISPLAY: ":0"
249+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
250+
commands:
251+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
252+
- unity-downloader-cli -u trunk --fast -o macos --wait --skip-download -c editor -c iOS > unity_revision.txt
253+
artifacts:
254+
unity_revision.zip:
255+
paths:
256+
- "unity_revision.txt"
257+
editor:priming:CUSTOM-REVISION:ios:
258+
name: '[CUSTOM-REVISION,ios] Editor priming'
259+
agent:
260+
type: Unity::VM
261+
image: cds-ops/ubuntu-16.04-base:stable
262+
flavor: b1.small
263+
skip_checkout: true
264+
variables:
265+
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
266+
DISPLAY: ":0"
267+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
268+
CUSTOM_REVISION: custom_revision_not_set
269+
commands:
270+
- pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.internal.unity3d.com/api/pypi/common-python/simple --upgrade
271+
- unity-downloader-cli -u $CUSTOM_REVISION -o macos --wait --skip-download -c editor -c iOS > unity_revision.txt
272+
artifacts:
273+
unity_revision.zip:
274+
paths:
275+
- "unity_revision.txt"

0 commit comments

Comments
 (0)