Skip to content

Commit 36e169c

Browse files
H3idi-XH3idi-X
authored
Task/urp 2023 (#262)
* Made the URP shader compatible with 2023.1. * updated _editor.yml * Added URP Test Project for 2023.1 * Added ReferenceImage/OSXEditor_AppleSilicon folder to 2023.1 URP graphics tests. * Added .meta files for newly added mac Reference Image. * Removed 2023.1 urp vulkan test for now as it crashes
1 parent 4827c25 commit 36e169c

File tree

831 files changed

+142626
-1
lines changed

Some content is hidden

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

831 files changed

+142626
-1
lines changed

‎.yamato/_editor.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ unity_versions:
66
- name: 2021.3
77
- name: 2022.1
88
- name: 2022.2
9+
- name: 2023.1
910
---
1011
{% for unity_version in unity_versions %}
1112
editor:priming:{{ unity_version.name }}:macos:

‎.yamato/osx_metal-urp-2021.3.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ test_projects:
66
unity_versions:
77
- name: 2021.3
88
# - name: 2022.1
9-
o# - name: trunk
9+
# - name: trunk
1010
---
1111
{% for test_project in test_projects %}
1212
{% for unity_version in unity_versions %}

‎.yamato/osx_metal-urp-2023.1.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: UniversalGraphicsTest-2023.1
6+
unity_versions:
7+
- name: 2023.1
8+
---
9+
{% for test_project in test_projects %}
10+
{% for unity_version in unity_versions %}
11+
{{ test_project.name }}_OSX_Metal_playmode_mono_Linear_{{ unity_version.name }}:
12+
name: {{ test_project.name }} on OSX_Metal_playmode_mono_Linear on version {{ unity_version.name }}
13+
agent:
14+
type: Unity::metal::macmini
15+
model: M1
16+
image: package-ci/macos-12:v0.0.1-1084810
17+
flavor: b1.large
18+
variables:
19+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
20+
commands:
21+
- command: curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output TestProjects/{{ test_project.name }}/utr
22+
- chmod +x TestProjects/{{ test_project.name }}/utr
23+
- command: ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "bash -lc 'pip3 install unity-downloader-cli --user --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade'"
24+
- command: rsync -aq -e 'ssh -i ~/.ssh/id_rsa_macmini' --append --timeout=30 $YAMATO_SOURCE_DIR bokken@$BOKKEN_DEVICE_IP:~/
25+
retries: 2
26+
- command: scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" ~/.ssh/id_rsa_macmini bokken@$BOKKEN_DEVICE_IP:~/.ssh/id_rsa_macmini
27+
retries: 2
28+
- command: ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP '$(python3 -m site --user-base)/bin/unity-downloader-cli --source-file ~/com.unity.toonshader/unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only'
29+
retries: 2
30+
- command: |5-
31+
32+
ssh -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" bokken@$BOKKEN_DEVICE_IP "export UPM_REGISTRY=https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates; echo \$UPM_REGISTRY; cd ~/com.unity.toonshader/TestProjects/{{ test_project.name }} && ~/com.unity.toonshader/TestProjects/{{ test_project.name }}/utr --artifacts_path=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results --editor-location=/Users/bokken/.Editor --extra-editor-arg="-colorspace=Linear" --reruncount=2 --scripting-backend=Mono2x --suite=playmode --testproject=/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}"
33+
UTR_RESULT=$?
34+
mkdir -p TestProjects/{{ test_project.name }}/test-results/
35+
scp -i ~/.ssh/id_rsa_macmini -o "StrictHostKeyChecking=no" -r bokken@$BOKKEN_DEVICE_IP:/Users/bokken/com.unity.toonshader/TestProjects/{{ test_project.name }}/test-results/ TestProjects/{{ test_project.name }}/test-results/
36+
exit $UTR_RESULT
37+
triggers:
38+
branches:
39+
only:
40+
- "/.*/"
41+
artifacts:
42+
logs:
43+
paths:
44+
- "**/test-results/**"
45+
- "TestProjects/{{ test_project.name }}/Logs/*.log"
46+
dependencies:
47+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:macos
48+
rerun: on-new-revision
49+
{% endfor %}
50+
{% endfor %}

‎.yamato/win_dx11-urp-2023.1.yml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#
2+
#
3+
#
4+
test_projects:
5+
- name: UniversalGraphicsTest-2023.1
6+
unity_versions:
7+
- name: 2023.1
8+
---
9+
{% for test_project in test_projects %}
10+
{% for unity_version in unity_versions %}
11+
{{ test_project.name }}_Win_DX11_playmode_{{ unity_version.name }}:
12+
name: {{ test_project.name }} on Win_DX11_playmode on version {{ unity_version.name }}
13+
agent:
14+
type: Unity::VM::GPU
15+
image: graphics-foundation/win10-dxr:stable
16+
flavor: b1.large
17+
model: gtx1080
18+
variables:
19+
UPM_REGISTRY: https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-candidates
20+
dependencies:
21+
- path: .yamato/_editor.yml#editor:priming:{{ unity_version.name }}:windows
22+
rerun: on-new-revision
23+
commands:
24+
- curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output TestProjects/{{ test_project.name }}/utr.bat
25+
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple --upgrade
26+
- cd TestProjects/{{ test_project.name }} && unity-downloader-cli --source-file ../../unity_revision_{{ unity_version.name }}.txt -c editor -c il2cpp --wait --published-only
27+
# - cd TestProjects/{{ test_project.name }} && utr --scripting-backend=Mono2x --suite=playmode --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11" --zero-tests-are-ok=1
28+
- cd TestProjects/{{ test_project.name }} && utr --suite=playmode --testproject=. --editor-location=.Editor --artifacts_path=test-results --extra-editor-arg="-force-d3d11"
29+
timeout: 360000
30+
retries: 1
31+
triggers:
32+
branches:
33+
only:
34+
- "/.*/"
35+
artifacts:
36+
logs:
37+
paths:
38+
- "**/test-results/**"
39+
{% endfor %}
40+
{% endfor %}

‎TestProjects/UniversalGraphicsTest-2023.1/Assets/Animations.meta‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TestProjects/UniversalGraphicsTest-2023.1/Assets/Animations/DoorLeft.anim‎

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!74 &7400000
4+
AnimationClip:
5+
m_ObjectHideFlags: 0
6+
m_PrefabParentObject: {fileID: 0}
7+
m_PrefabInternal: {fileID: 0}
8+
m_Name: DoorLeft
9+
serializedVersion: 6
10+
m_Legacy: 1
11+
m_Compressed: 0
12+
m_UseHighQualityCurve: 1
13+
m_RotationCurves: []
14+
m_CompressedRotationCurves: []
15+
m_EulerCurves: []
16+
m_PositionCurves:
17+
- curve:
18+
serializedVersion: 2
19+
m_Curve:
20+
- serializedVersion: 2
21+
time: 0
22+
value: {x: -11.05, y: 0.23683488, z: -7.5528917}
23+
inSlope: {x: 0, y: 0, z: 0}
24+
outSlope: {x: 0, y: 0, z: 0}
25+
tangentMode: 0
26+
- serializedVersion: 2
27+
time: 1
28+
value: {x: -11.05, y: 0.23683488, z: -7.5528917}
29+
inSlope: {x: 0, y: 0, z: 0}
30+
outSlope: {x: 0, y: 0, z: 0}
31+
tangentMode: 0
32+
- serializedVersion: 2
33+
time: 2
34+
value: {x: -11.97, y: 0.23683488, z: -7.5528917}
35+
inSlope: {x: 0, y: 0, z: 0}
36+
outSlope: {x: 0, y: 0, z: 0}
37+
tangentMode: 0
38+
- serializedVersion: 2
39+
time: 3
40+
value: {x: -11.05, y: 0.23683488, z: -7.5528917}
41+
inSlope: {x: 0, y: 0, z: 0}
42+
outSlope: {x: 0, y: 0, z: 0}
43+
tangentMode: 0
44+
m_PreInfinity: 2
45+
m_PostInfinity: 2
46+
m_RotationOrder: 4
47+
path:
48+
m_ScaleCurves: []
49+
m_FloatCurves: []
50+
m_PPtrCurves: []
51+
m_SampleRate: 60
52+
m_WrapMode: 2
53+
m_Bounds:
54+
m_Center: {x: 0, y: 0, z: 0}
55+
m_Extent: {x: 0, y: 0, z: 0}
56+
m_ClipBindingConstant:
57+
genericBindings: []
58+
pptrCurveMapping: []
59+
m_AnimationClipSettings:
60+
serializedVersion: 2
61+
m_AdditiveReferencePoseClip: {fileID: 0}
62+
m_AdditiveReferencePoseTime: 0
63+
m_StartTime: 0
64+
m_StopTime: 3
65+
m_OrientationOffsetY: 0
66+
m_Level: 0
67+
m_CycleOffset: 0
68+
m_HasAdditiveReferencePose: 0
69+
m_LoopTime: 1
70+
m_LoopBlend: 0
71+
m_LoopBlendOrientation: 0
72+
m_LoopBlendPositionY: 0
73+
m_LoopBlendPositionXZ: 0
74+
m_KeepOriginalOrientation: 0
75+
m_KeepOriginalPositionY: 1
76+
m_KeepOriginalPositionXZ: 0
77+
m_HeightFromFeet: 0
78+
m_Mirror: 0
79+
m_EditorCurves:
80+
- curve:
81+
serializedVersion: 2
82+
m_Curve:
83+
- serializedVersion: 2
84+
time: 0
85+
value: -11.05
86+
inSlope: 0
87+
outSlope: 0
88+
tangentMode: 136
89+
- serializedVersion: 2
90+
time: 1
91+
value: -11.05
92+
inSlope: 0
93+
outSlope: 0
94+
tangentMode: 136
95+
- serializedVersion: 2
96+
time: 2
97+
value: -11.97
98+
inSlope: 0
99+
outSlope: 0
100+
tangentMode: 136
101+
- serializedVersion: 2
102+
time: 3
103+
value: -11.05
104+
inSlope: 0
105+
outSlope: 0
106+
tangentMode: 136
107+
m_PreInfinity: 2
108+
m_PostInfinity: 2
109+
m_RotationOrder: 4
110+
attribute: m_LocalPosition.x
111+
path:
112+
classID: 4
113+
script: {fileID: 0}
114+
- curve:
115+
serializedVersion: 2
116+
m_Curve:
117+
- serializedVersion: 2
118+
time: 0
119+
value: 0.23683488
120+
inSlope: 0
121+
outSlope: 0
122+
tangentMode: 136
123+
- serializedVersion: 2
124+
time: 1
125+
value: 0.23683488
126+
inSlope: 0
127+
outSlope: 0
128+
tangentMode: 136
129+
- serializedVersion: 2
130+
time: 2
131+
value: 0.23683488
132+
inSlope: 0
133+
outSlope: 0
134+
tangentMode: 136
135+
- serializedVersion: 2
136+
time: 3
137+
value: 0.23683488
138+
inSlope: 0
139+
outSlope: 0
140+
tangentMode: 136
141+
m_PreInfinity: 2
142+
m_PostInfinity: 2
143+
m_RotationOrder: 4
144+
attribute: m_LocalPosition.y
145+
path:
146+
classID: 4
147+
script: {fileID: 0}
148+
- curve:
149+
serializedVersion: 2
150+
m_Curve:
151+
- serializedVersion: 2
152+
time: 0
153+
value: -7.5528917
154+
inSlope: 0
155+
outSlope: 0
156+
tangentMode: 136
157+
- serializedVersion: 2
158+
time: 1
159+
value: -7.5528917
160+
inSlope: 0
161+
outSlope: 0
162+
tangentMode: 136
163+
- serializedVersion: 2
164+
time: 2
165+
value: -7.5528917
166+
inSlope: 0
167+
outSlope: 0
168+
tangentMode: 136
169+
- serializedVersion: 2
170+
time: 3
171+
value: -7.5528917
172+
inSlope: 0
173+
outSlope: 0
174+
tangentMode: 136
175+
m_PreInfinity: 2
176+
m_PostInfinity: 2
177+
m_RotationOrder: 4
178+
attribute: m_LocalPosition.z
179+
path:
180+
classID: 4
181+
script: {fileID: 0}
182+
m_EulerEditorCurves: []
183+
m_HasGenericRootTransform: 0
184+
m_HasMotionFloatCurves: 0
185+
m_GenerateMotionCurves: 0
186+
m_Events: []

‎TestProjects/UniversalGraphicsTest-2023.1/Assets/Animations/DoorLeft.anim.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)