Skip to content

Commit 748b345

Browse files
simon-lemay-unitysimon-lemay-unity
authored
Merge branch 'develop-2.0.0' into feat/useful-custom-drivers
2 parents 0f2e650 + ff571bc commit 748b345

25 files changed

+1676
-349
lines changed

‎.yamato/_run-all.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,9 @@ run_all_webgl_builds:
110110
dependencies:
111111
{% for project in projects.default -%}
112112
{% for platform in test_platforms.desktop -%}
113-
{% 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
114113
{% for editor in validation_editors.all -%}
115114
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
116115
{% endfor -%}
117-
{% endif -%}
118116
{% endfor -%}
119117
{% endfor -%}
120118

@@ -125,11 +123,9 @@ run_all_webgl_builds_trunk:
125123
dependencies:
126124
{% for project in projects.default -%}
127125
{% for platform in test_platforms.desktop -%}
128-
{% 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
129126
{% for editor in validation_editors.default -%}
130127
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
131128
{% endfor -%}
132-
{% endif -%}
133129
{% endfor -%}
134130
{% endfor -%}
135131

@@ -139,9 +135,7 @@ run_all_webgl_builds_6000:
139135
dependencies:
140136
{% for project in projects.default -%}
141137
{% for platform in test_platforms.desktop -%}
142-
{% 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
143138
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_6000.0
144-
{% endif -%}
145139
{% endfor -%}
146140
{% endfor -%}
147141

‎.yamato/project.metafile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ test_platforms:
3737
default:
3838
- name: ubuntu
3939
type: Unity::VM
40-
image: package-ci/ubuntu-22.04:v4.71.0
40+
image: package-ci/ubuntu-22.04:v4
4141
flavor: b1.large
4242
standalone: StandaloneLinux64
4343
desktop:
4444
- name: ubuntu
4545
type: Unity::VM
46-
image: package-ci/ubuntu-22.04:v4.71.0
46+
image: package-ci/ubuntu-22.04:v4
4747
flavor: b1.large
4848
standalone: StandaloneLinux64
4949
model: rtx2080

‎.yamato/webgl-build.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@
2626

2727
{% for project in projects.default -%}
2828
{% for platform in test_platforms.desktop -%}
29-
{% 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
3029
{% for editor in validation_editors.all -%}
3130
webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3231
name: WebGl Build - {{ project.name }} [{{ platform.name }}, {{ editor }}, il2cpp]
3332
agent:
3433
type: {{ platform.type }}
3534
image: {{ platform.image }}
36-
flavor: {{ platform.flavor }}
35+
flavor: b1.xlarge # We use b1.xlarge for WebGL builds since it requires more resources (otherwise it hangs and timeouts) especially on Ubuntu platform
3736
{% if platform.model %}
3837
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
3938
{% endif %}
@@ -53,6 +52,5 @@ webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
5352
- "artifacts/**/*"
5453
- "build/players/**/*"
5554
{% endfor -%}
56-
{% endif -%}
5755
{% endfor -%}
5856
{% endfor -%}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
5151
dependencies:
5252
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
5353
variables:
54-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
54+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.12.1.0
57+
Wrench: 0.12.2.0
5858

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ package_pack_-_netcode_gameobjects:
2424
UPMCI_ACK_LARGE_PACKAGE: 1
2525
metadata:
2626
Job Maintainers: '#rm-packageworks'
27-
Wrench: 0.12.1.0
27+
Wrench: 0.12.2.0
2828

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

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ all_preview_apv_jobs:
1919
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_windows
2020
metadata:
2121
Job Maintainers: '#rm-packageworks'
22-
Wrench: 0.12.1.0
22+
Wrench: 0.12.2.0
2323

2424
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
2525
preview_apv_-_6000_0_-_macos:
@@ -70,10 +70,10 @@ preview_apv_-_6000_0_-_macos:
7070
dependencies:
7171
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
7272
variables:
73-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
73+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
7474
metadata:
7575
Job Maintainers: '#rm-packageworks'
76-
Wrench: 0.12.1.0
76+
Wrench: 0.12.2.0
7777

7878
# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
7979
preview_apv_-_6000_0_-_ubuntu:
@@ -124,10 +124,10 @@ preview_apv_-_6000_0_-_ubuntu:
124124
dependencies:
125125
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
126126
variables:
127-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
127+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
128128
metadata:
129129
Job Maintainers: '#rm-packageworks'
130-
Wrench: 0.12.1.0
130+
Wrench: 0.12.2.0
131131

132132
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
133133
preview_apv_-_6000_0_-_windows:
@@ -179,10 +179,10 @@ preview_apv_-_6000_0_-_windows:
179179
dependencies:
180180
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
181181
variables:
182-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
182+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
183183
metadata:
184184
Job Maintainers: '#rm-packageworks'
185-
Wrench: 0.12.1.0
185+
Wrench: 0.12.2.0
186186

187187
# Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
188188
preview_apv_-_6000_1_-_macos:
@@ -233,10 +233,10 @@ preview_apv_-_6000_1_-_macos:
233233
dependencies:
234234
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
235235
variables:
236-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
236+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
237237
metadata:
238238
Job Maintainers: '#rm-packageworks'
239-
Wrench: 0.12.1.0
239+
Wrench: 0.12.2.0
240240

241241
# Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
242242
preview_apv_-_6000_1_-_ubuntu:
@@ -287,10 +287,10 @@ preview_apv_-_6000_1_-_ubuntu:
287287
dependencies:
288288
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
289289
variables:
290-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
290+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
291291
metadata:
292292
Job Maintainers: '#rm-packageworks'
293-
Wrench: 0.12.1.0
293+
Wrench: 0.12.2.0
294294

295295
# Functional tests for dependents found in the latest 6000.1 manifest (Windows).
296296
preview_apv_-_6000_1_-_windows:
@@ -342,10 +342,10 @@ preview_apv_-_6000_1_-_windows:
342342
dependencies:
343343
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
344344
variables:
345-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
345+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
346346
metadata:
347347
Job Maintainers: '#rm-packageworks'
348-
Wrench: 0.12.1.0
348+
Wrench: 0.12.2.0
349349

350350
# Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
351351
preview_apv_-_6000_2_-_macos:
@@ -396,10 +396,10 @@ preview_apv_-_6000_2_-_macos:
396396
dependencies:
397397
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
398398
variables:
399-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
399+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
400400
metadata:
401401
Job Maintainers: '#rm-packageworks'
402-
Wrench: 0.12.1.0
402+
Wrench: 0.12.2.0
403403

404404
# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
405405
preview_apv_-_6000_2_-_ubuntu:
@@ -450,10 +450,10 @@ preview_apv_-_6000_2_-_ubuntu:
450450
dependencies:
451451
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
452452
variables:
453-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
453+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
454454
metadata:
455455
Job Maintainers: '#rm-packageworks'
456-
Wrench: 0.12.1.0
456+
Wrench: 0.12.2.0
457457

458458
# Functional tests for dependents found in the latest 6000.2 manifest (Windows).
459459
preview_apv_-_6000_2_-_windows:
@@ -505,10 +505,10 @@ preview_apv_-_6000_2_-_windows:
505505
dependencies:
506506
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
507507
variables:
508-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
508+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
509509
metadata:
510510
Job Maintainers: '#rm-packageworks'
511-
Wrench: 0.12.1.0
511+
Wrench: 0.12.2.0
512512

513513
# Functional tests for dependents found in the latest 6000.3 manifest (MacOS).
514514
preview_apv_-_6000_3_-_macos:
@@ -559,10 +559,10 @@ preview_apv_-_6000_3_-_macos:
559559
dependencies:
560560
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
561561
variables:
562-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
562+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
563563
metadata:
564564
Job Maintainers: '#rm-packageworks'
565-
Wrench: 0.12.1.0
565+
Wrench: 0.12.2.0
566566

567567
# Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu).
568568
preview_apv_-_6000_3_-_ubuntu:
@@ -613,10 +613,10 @@ preview_apv_-_6000_3_-_ubuntu:
613613
dependencies:
614614
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
615615
variables:
616-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
616+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
617617
metadata:
618618
Job Maintainers: '#rm-packageworks'
619-
Wrench: 0.12.1.0
619+
Wrench: 0.12.2.0
620620

621621
# Functional tests for dependents found in the latest 6000.3 manifest (Windows).
622622
preview_apv_-_6000_3_-_windows:
@@ -668,8 +668,8 @@ preview_apv_-_6000_3_-_windows:
668668
dependencies:
669669
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
670670
variables:
671-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
671+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
672672
metadata:
673673
Job Maintainers: '#rm-packageworks'
674-
Wrench: 0.12.1.0
674+
Wrench: 0.12.2.0
675675

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ publish_dry_run_netcode_gameobjects:
148148
ignore_artifact: true
149149
variables:
150150
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
151-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
151+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
152152
metadata:
153153
Job Maintainers: '#rm-packageworks'
154-
Wrench: 0.12.1.0
154+
Wrench: 0.12.2.0
155155

156156
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
157157
publish_netcode_gameobjects:
@@ -300,8 +300,8 @@ publish_netcode_gameobjects:
300300
ignore_artifact: true
301301
variables:
302302
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
303-
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
303+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
304304
metadata:
305305
Job Maintainers: '#rm-packageworks'
306-
Wrench: 0.12.1.0
306+
Wrench: 0.12.2.0
307307

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ test_-_wrench_jobs_up_to_date:
99
type: Unity::VM
1010
flavor: b1.large
1111
commands:
12-
- command: dotnet run --project Tools/CI/NGO.Cookbook.csproj
12+
- command: dotnet run --project Tools\CI\NGO.Cookbook.csproj
1313
- command: |-
1414
if [ -n "$(git status --porcelain -- .yamato/wrench)" ]; then
1515
git status
1616
echo "Your repo is not clean - diff output:"
1717
git diff
1818
echo "You must run recipe generation after updating recipes to update the generated YAML!"
19-
echo "Run 'dotnet run --project Tools/CI/NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
19+
echo "Run 'dotnet run --project Tools\CI\NGO.Cookbook.csproj' from the root of your repository to regenerate all job definitions created by wrench."
2020
exit 1
2121
fi
2222
variables:
@@ -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.12.1.0
29+
Wrench: 0.12.2.0
3030

0 commit comments

Comments
 (0)