Skip to content

Commit f7e8912

Browse files
EmandMEmandM
authored
Merge branch 'develop' into chore/1.x/network-transform-parenting-test
2 parents fc1dd87 + d17d98b commit f7e8912

File tree

10 files changed

+173
-106
lines changed

10 files changed

+173
-106
lines changed

‎.yamato/_run-all.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,11 @@ run_all_webgl_builds:
102102
dependencies:
103103
{% for project in projects.default -%}
104104
{% for platform in test_platforms.desktop -%}
105+
{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
105106
{% for editor in validation_editors.all -%}
106107
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
107108
{% endfor -%}
109+
{% endif -%}
108110
{% endfor -%}
109111
{% endfor -%}
110112

@@ -115,9 +117,11 @@ run_all_webgl_builds_trunk:
115117
dependencies:
116118
{% for project in projects.default -%}
117119
{% for platform in test_platforms.desktop -%}
120+
{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
118121
{% for editor in validation_editors.default -%}
119122
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
120123
{% endfor -%}
124+
{% endif -%}
121125
{% endfor -%}
122126
{% endfor -%}
123127

@@ -127,7 +131,9 @@ run_all_webgl_builds_2021:
127131
dependencies:
128132
{% for project in projects.default -%}
129133
{% for platform in test_platforms.desktop -%}
134+
{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
130135
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_2021.3
136+
{% endif -%}
131137
{% endfor -%}
132138
{% endfor -%}
133139

‎.yamato/webgl-build.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
{% for project in projects.default -%}
2727
{% for platform in test_platforms.desktop -%}
28+
{% if platform.name != "mac" -%} # There is an error about "Light baking could not be started because no valid OpenCL device could be found". Tracked in MTT-11726
2829
{% for editor in validation_editors.all -%}
2930
webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3031
name: WebGl Build - {{ project.name }} [{{ platform.name }}, {{ editor }}, il2cpp]
@@ -37,7 +38,7 @@ webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3738
{% endif %}
3839
commands:
3940
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c webgl -c il2cpp {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloading the editor with additional webgl and il2cpp components
40-
41+
4142
# The following step builds the player with defined options such as:
4243
# Suite parameter if defined since it's a mandatory field to define which test suite should be used, but it doesn't matter in this case since we won't run any tests (--suite)
4344
# Editor is run in batchmode, which means that Unity runs command line arguments without the need for human interaction. It also suppresses pop-up windows that require human interaction (such as the Save Scene window). We should always run Unity in batch mode when using command line arguments, because it allows automation to run without interruption. (--extra-editor-arg=-batchmode)
@@ -51,5 +52,6 @@ webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
5152
- "artifacts/**/*"
5253
- "build/players/**/*"
5354
{% endfor -%}
55+
{% endif -%}
5456
{% endfor -%}
5557
{% endfor -%}

‎.yamato/wrench/api-validation-jobs.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
1313
type: Unity::VM
1414
flavor: b1.large
1515
commands:
16-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-59_594aea2e5eb3a7468ad88458b5c5da2e5e72af0d2267db7b025602fb69e57bd7.zip -o wrench-localapv.zip
16+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
1717
- command: 7z x -aoa wrench-localapv.zip
1818
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1919
- command: python PythonScripts/print_machine_info.py
@@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
5151
dependencies:
5252
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
5353
variables:
54-
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
54+
UPMPVP_CONTEXT_WRENCH: 0.10.45.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.10.44.0
57+
Wrench: 0.10.45.0
5858

‎.yamato/wrench/package-pack-jobs.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ package_pack_-_netcode_gameobjects:
2424
UPMCI_ACK_LARGE_PACKAGE: 1
2525
metadata:
2626
Job Maintainers: '#rm-packageworks'
27-
Wrench: 0.10.44.0
28-
27+
Wrench: 0.10.45.0
2928

‎.yamato/wrench/preview-a-p-v.yml‎

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

‎.yamato/wrench/promotion-jobs.yml‎

Lines changed: 66 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ publish_dry_run_netcode_gameobjects:
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
12-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-59_594aea2e5eb3a7468ad88458b5c5da2e5e72af0d2267db7b025602fb69e57bd7.zip -o wrench-localapv.zip
12+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
1313
- command: 7z x -aoa wrench-localapv.zip
1414
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1515
- command: python PythonScripts/print_machine_info.py
@@ -34,6 +34,8 @@ publish_dry_run_netcode_gameobjects:
3434
pvp-results:
3535
location: results/pvp/validate-netcode.gameobjects-2021.3-macos
3636
unzip: true
37+
packages:
38+
ignore_artifact: true
3739
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2021_3_-_ubuntu
3840
specific_options:
3941
UTR:
@@ -42,6 +44,8 @@ publish_dry_run_netcode_gameobjects:
4244
pvp-results:
4345
location: results/pvp/validate-netcode.gameobjects-2021.3-ubuntu
4446
unzip: true
47+
packages:
48+
ignore_artifact: true
4549
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2021_3_-_windows
4650
specific_options:
4751
UTR:
@@ -50,6 +54,8 @@ publish_dry_run_netcode_gameobjects:
5054
pvp-results:
5155
location: results/pvp/validate-netcode.gameobjects-2021.3-windows
5256
unzip: true
57+
packages:
58+
ignore_artifact: true
5359
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_macos
5460
specific_options:
5561
UTR:
@@ -58,6 +64,8 @@ publish_dry_run_netcode_gameobjects:
5864
pvp-results:
5965
location: results/pvp/validate-netcode.gameobjects-2022.3-macos
6066
unzip: true
67+
packages:
68+
ignore_artifact: true
6169
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_ubuntu
6270
specific_options:
6371
UTR:
@@ -66,6 +74,8 @@ publish_dry_run_netcode_gameobjects:
6674
pvp-results:
6775
location: results/pvp/validate-netcode.gameobjects-2022.3-ubuntu
6876
unzip: true
77+
packages:
78+
ignore_artifact: true
6979
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_windows
7080
specific_options:
7181
UTR:
@@ -74,6 +84,8 @@ publish_dry_run_netcode_gameobjects:
7484
pvp-results:
7585
location: results/pvp/validate-netcode.gameobjects-2022.3-windows
7686
unzip: true
87+
packages:
88+
ignore_artifact: true
7789
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_macos
7890
specific_options:
7991
UTR:
@@ -82,6 +94,8 @@ publish_dry_run_netcode_gameobjects:
8294
pvp-results:
8395
location: results/pvp/validate-netcode.gameobjects-6000.0-macos
8496
unzip: true
97+
packages:
98+
ignore_artifact: true
8599
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_ubuntu
86100
specific_options:
87101
UTR:
@@ -90,6 +104,8 @@ publish_dry_run_netcode_gameobjects:
90104
pvp-results:
91105
location: results/pvp/validate-netcode.gameobjects-6000.0-ubuntu
92106
unzip: true
107+
packages:
108+
ignore_artifact: true
93109
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_windows
94110
specific_options:
95111
UTR:
@@ -98,6 +114,8 @@ publish_dry_run_netcode_gameobjects:
98114
pvp-results:
99115
location: results/pvp/validate-netcode.gameobjects-6000.0-windows
100116
unzip: true
117+
packages:
118+
ignore_artifact: true
101119
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_macos
102120
specific_options:
103121
UTR:
@@ -106,6 +124,8 @@ publish_dry_run_netcode_gameobjects:
106124
pvp-results:
107125
location: results/pvp/validate-netcode.gameobjects-6000.1-macos
108126
unzip: true
127+
packages:
128+
ignore_artifact: true
109129
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_ubuntu
110130
specific_options:
111131
UTR:
@@ -114,6 +134,8 @@ publish_dry_run_netcode_gameobjects:
114134
pvp-results:
115135
location: results/pvp/validate-netcode.gameobjects-6000.1-ubuntu
116136
unzip: true
137+
packages:
138+
ignore_artifact: true
117139
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_windows
118140
specific_options:
119141
UTR:
@@ -122,6 +144,8 @@ publish_dry_run_netcode_gameobjects:
122144
pvp-results:
123145
location: results/pvp/validate-netcode.gameobjects-6000.1-windows
124146
unzip: true
147+
packages:
148+
ignore_artifact: true
125149
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_macos
126150
specific_options:
127151
UTR:
@@ -130,6 +154,8 @@ publish_dry_run_netcode_gameobjects:
130154
pvp-results:
131155
location: results/pvp/validate-netcode.gameobjects-6000.2-macos
132156
unzip: true
157+
packages:
158+
ignore_artifact: true
133159
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_ubuntu
134160
specific_options:
135161
UTR:
@@ -138,6 +164,8 @@ publish_dry_run_netcode_gameobjects:
138164
pvp-results:
139165
location: results/pvp/validate-netcode.gameobjects-6000.2-ubuntu
140166
unzip: true
167+
packages:
168+
ignore_artifact: true
141169
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_windows
142170
specific_options:
143171
UTR:
@@ -146,12 +174,14 @@ publish_dry_run_netcode_gameobjects:
146174
pvp-results:
147175
location: results/pvp/validate-netcode.gameobjects-6000.2-windows
148176
unzip: true
177+
packages:
178+
ignore_artifact: true
149179
variables:
150180
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
151-
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
181+
UPMPVP_CONTEXT_WRENCH: 0.10.45.0
152182
metadata:
153183
Job Maintainers: '#rm-packageworks'
154-
Wrench: 0.10.44.0
184+
Wrench: 0.10.45.0
155185

156186
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
157187
publish_netcode_gameobjects:
@@ -161,7 +191,7 @@ publish_netcode_gameobjects:
161191
type: Unity::VM
162192
flavor: b1.large
163193
commands:
164-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-59_594aea2e5eb3a7468ad88458b5c5da2e5e72af0d2267db7b025602fb69e57bd7.zip -o wrench-localapv.zip
194+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
165195
- command: 7z x -aoa wrench-localapv.zip
166196
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
167197
- command: python PythonScripts/print_machine_info.py
@@ -186,6 +216,8 @@ publish_netcode_gameobjects:
186216
pvp-results:
187217
location: results/pvp/validate-netcode.gameobjects-2021.3-macos
188218
unzip: true
219+
packages:
220+
ignore_artifact: true
189221
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2021_3_-_ubuntu
190222
specific_options:
191223
UTR:
@@ -194,6 +226,8 @@ publish_netcode_gameobjects:
194226
pvp-results:
195227
location: results/pvp/validate-netcode.gameobjects-2021.3-ubuntu
196228
unzip: true
229+
packages:
230+
ignore_artifact: true
197231
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2021_3_-_windows
198232
specific_options:
199233
UTR:
@@ -202,6 +236,8 @@ publish_netcode_gameobjects:
202236
pvp-results:
203237
location: results/pvp/validate-netcode.gameobjects-2021.3-windows
204238
unzip: true
239+
packages:
240+
ignore_artifact: true
205241
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_macos
206242
specific_options:
207243
UTR:
@@ -210,6 +246,8 @@ publish_netcode_gameobjects:
210246
pvp-results:
211247
location: results/pvp/validate-netcode.gameobjects-2022.3-macos
212248
unzip: true
249+
packages:
250+
ignore_artifact: true
213251
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_ubuntu
214252
specific_options:
215253
UTR:
@@ -218,6 +256,8 @@ publish_netcode_gameobjects:
218256
pvp-results:
219257
location: results/pvp/validate-netcode.gameobjects-2022.3-ubuntu
220258
unzip: true
259+
packages:
260+
ignore_artifact: true
221261
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_2022_3_-_windows
222262
specific_options:
223263
UTR:
@@ -226,6 +266,8 @@ publish_netcode_gameobjects:
226266
pvp-results:
227267
location: results/pvp/validate-netcode.gameobjects-2022.3-windows
228268
unzip: true
269+
packages:
270+
ignore_artifact: true
229271
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_macos
230272
specific_options:
231273
UTR:
@@ -234,6 +276,8 @@ publish_netcode_gameobjects:
234276
pvp-results:
235277
location: results/pvp/validate-netcode.gameobjects-6000.0-macos
236278
unzip: true
279+
packages:
280+
ignore_artifact: true
237281
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_ubuntu
238282
specific_options:
239283
UTR:
@@ -242,6 +286,8 @@ publish_netcode_gameobjects:
242286
pvp-results:
243287
location: results/pvp/validate-netcode.gameobjects-6000.0-ubuntu
244288
unzip: true
289+
packages:
290+
ignore_artifact: true
245291
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_0_-_windows
246292
specific_options:
247293
UTR:
@@ -250,6 +296,8 @@ publish_netcode_gameobjects:
250296
pvp-results:
251297
location: results/pvp/validate-netcode.gameobjects-6000.0-windows
252298
unzip: true
299+
packages:
300+
ignore_artifact: true
253301
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_macos
254302
specific_options:
255303
UTR:
@@ -258,6 +306,8 @@ publish_netcode_gameobjects:
258306
pvp-results:
259307
location: results/pvp/validate-netcode.gameobjects-6000.1-macos
260308
unzip: true
309+
packages:
310+
ignore_artifact: true
261311
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_ubuntu
262312
specific_options:
263313
UTR:
@@ -266,6 +316,8 @@ publish_netcode_gameobjects:
266316
pvp-results:
267317
location: results/pvp/validate-netcode.gameobjects-6000.1-ubuntu
268318
unzip: true
319+
packages:
320+
ignore_artifact: true
269321
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_1_-_windows
270322
specific_options:
271323
UTR:
@@ -274,6 +326,8 @@ publish_netcode_gameobjects:
274326
pvp-results:
275327
location: results/pvp/validate-netcode.gameobjects-6000.1-windows
276328
unzip: true
329+
packages:
330+
ignore_artifact: true
277331
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_macos
278332
specific_options:
279333
UTR:
@@ -282,6 +336,8 @@ publish_netcode_gameobjects:
282336
pvp-results:
283337
location: results/pvp/validate-netcode.gameobjects-6000.2-macos
284338
unzip: true
339+
packages:
340+
ignore_artifact: true
285341
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_ubuntu
286342
specific_options:
287343
UTR:
@@ -290,6 +346,8 @@ publish_netcode_gameobjects:
290346
pvp-results:
291347
location: results/pvp/validate-netcode.gameobjects-6000.2-ubuntu
292348
unzip: true
349+
packages:
350+
ignore_artifact: true
293351
- path: .yamato/wrench/validation-jobs.yml#validate_-_netcode_gameobjects_-_6000_2_-_windows
294352
specific_options:
295353
UTR:
@@ -298,10 +356,12 @@ publish_netcode_gameobjects:
298356
pvp-results:
299357
location: results/pvp/validate-netcode.gameobjects-6000.2-windows
300358
unzip: true
359+
packages:
360+
ignore_artifact: true
301361
variables:
302362
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
303-
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
363+
UPMPVP_CONTEXT_WRENCH: 0.10.45.0
304364
metadata:
305365
Job Maintainers: '#rm-packageworks'
306-
Wrench: 0.10.44.0
366+
Wrench: 0.10.45.0
307367

‎.yamato/wrench/recipe-regeneration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ test_-_wrench_jobs_up_to_date:
2626
cancel_old_ci: true
2727
metadata:
2828
Job Maintainers: '#rm-packageworks'
29-
Wrench: 0.10.44.0
29+
Wrench: 0.10.45.0
3030

0 commit comments

Comments
 (0)