Skip to content

Commit 9c10a66

Browse files
michalChrobotmichalChrobot
authored
Merge branch 'develop-2.0.0' into fix-webgl-timeout-2.x
2 parents e69d7f8 + 30cf113 commit 9c10a66

File tree

9 files changed

+170
-160
lines changed

9 files changed

+170
-160
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
2020
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
2121
timeout: 20
2222
retries: 10
23-
- command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
23+
- command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
2424
timeout: 10
2525
retries: 3
2626
- command: python PythonScripts/PackageJsonCondersor.py
@@ -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.11.3.0
54+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.11.3.0
57+
Wrench: 0.12.1.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.11.3.0
27+
Wrench: 0.12.1.0
2828

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

Lines changed: 37 additions & 37 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.11.3.0
22+
Wrench: 0.12.1.0
2323

2424
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
2525
preview_apv_-_6000_0_-_macos:
@@ -36,7 +36,7 @@ preview_apv_-_6000_0_-_macos:
3636
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
3737
timeout: 20
3838
retries: 10
39-
- command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
39+
- command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
4040
timeout: 10
4141
retries: 3
4242
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -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.11.3.0
73+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
7474
metadata:
7575
Job Maintainers: '#rm-packageworks'
76-
Wrench: 0.11.3.0
76+
Wrench: 0.12.1.0
7777

7878
# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
7979
preview_apv_-_6000_0_-_ubuntu:
@@ -90,7 +90,7 @@ preview_apv_-_6000_0_-_ubuntu:
9090
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
9191
timeout: 20
9292
retries: 10
93-
- command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
93+
- command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
9494
timeout: 10
9595
retries: 3
9696
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -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.11.3.0
127+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
128128
metadata:
129129
Job Maintainers: '#rm-packageworks'
130-
Wrench: 0.11.3.0
130+
Wrench: 0.12.1.0
131131

132132
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
133133
preview_apv_-_6000_0_-_windows:
@@ -145,7 +145,7 @@ preview_apv_-_6000_0_-_windows:
145145
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
146146
timeout: 20
147147
retries: 10
148-
- command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
148+
- command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
149149
timeout: 10
150150
retries: 3
151151
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.0 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -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.11.3.0
182+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
183183
metadata:
184184
Job Maintainers: '#rm-packageworks'
185-
Wrench: 0.11.3.0
185+
Wrench: 0.12.1.0
186186

187187
# Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
188188
preview_apv_-_6000_1_-_macos:
@@ -199,7 +199,7 @@ preview_apv_-_6000_1_-_macos:
199199
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
200200
timeout: 20
201201
retries: 10
202-
- command: unity-downloader-cli -u 6000.1/staging -c Editor --fast
202+
- command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
203203
timeout: 10
204204
retries: 3
205205
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -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.11.3.0
236+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
237237
metadata:
238238
Job Maintainers: '#rm-packageworks'
239-
Wrench: 0.11.3.0
239+
Wrench: 0.12.1.0
240240

241241
# Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
242242
preview_apv_-_6000_1_-_ubuntu:
@@ -253,7 +253,7 @@ preview_apv_-_6000_1_-_ubuntu:
253253
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
254254
timeout: 20
255255
retries: 10
256-
- command: unity-downloader-cli -u 6000.1/staging -c Editor --fast
256+
- command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
257257
timeout: 10
258258
retries: 3
259259
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -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.11.3.0
290+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
291291
metadata:
292292
Job Maintainers: '#rm-packageworks'
293-
Wrench: 0.11.3.0
293+
Wrench: 0.12.1.0
294294

295295
# Functional tests for dependents found in the latest 6000.1 manifest (Windows).
296296
preview_apv_-_6000_1_-_windows:
@@ -308,7 +308,7 @@ preview_apv_-_6000_1_-_windows:
308308
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
309309
timeout: 20
310310
retries: 10
311-
- command: unity-downloader-cli -u 6000.1/staging -c Editor --fast
311+
- command: unity-downloader-cli -u 6000.1/staging -c editor --path .Editor --fast
312312
timeout: 10
313313
retries: 3
314314
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.1 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -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.11.3.0
345+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
346346
metadata:
347347
Job Maintainers: '#rm-packageworks'
348-
Wrench: 0.11.3.0
348+
Wrench: 0.12.1.0
349349

350350
# Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
351351
preview_apv_-_6000_2_-_macos:
@@ -362,7 +362,7 @@ preview_apv_-_6000_2_-_macos:
362362
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
363363
timeout: 20
364364
retries: 10
365-
- command: unity-downloader-cli -u 6000.2/staging -c Editor --fast
365+
- command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast
366366
timeout: 10
367367
retries: 3
368368
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -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.11.3.0
399+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
400400
metadata:
401401
Job Maintainers: '#rm-packageworks'
402-
Wrench: 0.11.3.0
402+
Wrench: 0.12.1.0
403403

404404
# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
405405
preview_apv_-_6000_2_-_ubuntu:
@@ -416,7 +416,7 @@ preview_apv_-_6000_2_-_ubuntu:
416416
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
417417
timeout: 20
418418
retries: 10
419-
- command: unity-downloader-cli -u 6000.2/staging -c Editor --fast
419+
- command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast
420420
timeout: 10
421421
retries: 3
422422
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -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.11.3.0
453+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
454454
metadata:
455455
Job Maintainers: '#rm-packageworks'
456-
Wrench: 0.11.3.0
456+
Wrench: 0.12.1.0
457457

458458
# Functional tests for dependents found in the latest 6000.2 manifest (Windows).
459459
preview_apv_-_6000_2_-_windows:
@@ -471,7 +471,7 @@ preview_apv_-_6000_2_-_windows:
471471
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
472472
timeout: 20
473473
retries: 10
474-
- command: unity-downloader-cli -u 6000.2/staging -c Editor --fast
474+
- command: unity-downloader-cli -u 6000.2/staging -c editor --path .Editor --fast
475475
timeout: 10
476476
retries: 3
477477
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.2 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -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.11.3.0
508+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
509509
metadata:
510510
Job Maintainers: '#rm-packageworks'
511-
Wrench: 0.11.3.0
511+
Wrench: 0.12.1.0
512512

513513
# Functional tests for dependents found in the latest 6000.3 manifest (MacOS).
514514
preview_apv_-_6000_3_-_macos:
@@ -525,7 +525,7 @@ preview_apv_-_6000_3_-_macos:
525525
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
526526
timeout: 20
527527
retries: 10
528-
- command: unity-downloader-cli -u trunk -c Editor --fast
528+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
529529
timeout: 10
530530
retries: 3
531531
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -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.11.3.0
562+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
563563
metadata:
564564
Job Maintainers: '#rm-packageworks'
565-
Wrench: 0.11.3.0
565+
Wrench: 0.12.1.0
566566

567567
# Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu).
568568
preview_apv_-_6000_3_-_ubuntu:
@@ -579,7 +579,7 @@ preview_apv_-_6000_3_-_ubuntu:
579579
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
580580
timeout: 20
581581
retries: 10
582-
- command: unity-downloader-cli -u trunk -c Editor --fast
582+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
583583
timeout: 10
584584
retries: 3
585585
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -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.11.3.0
616+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
617617
metadata:
618618
Job Maintainers: '#rm-packageworks'
619-
Wrench: 0.11.3.0
619+
Wrench: 0.12.1.0
620620

621621
# Functional tests for dependents found in the latest 6000.3 manifest (Windows).
622622
preview_apv_-_6000_3_-_windows:
@@ -634,7 +634,7 @@ preview_apv_-_6000_3_-_windows:
634634
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
635635
timeout: 20
636636
retries: 10
637-
- command: unity-downloader-cli -u trunk -c Editor --fast
637+
- command: unity-downloader-cli -u trunk -c editor --path .Editor --fast
638638
timeout: 10
639639
retries: 3
640640
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
@@ -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.11.3.0
671+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
672672
metadata:
673673
Job Maintainers: '#rm-packageworks'
674-
Wrench: 0.11.3.0
674+
Wrench: 0.12.1.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.11.3.0
151+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
152152
metadata:
153153
Job Maintainers: '#rm-packageworks'
154-
Wrench: 0.11.3.0
154+
Wrench: 0.12.1.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.11.3.0
303+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
304304
metadata:
305305
Job Maintainers: '#rm-packageworks'
306-
Wrench: 0.11.3.0
306+
Wrench: 0.12.1.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.11.3.0
29+
Wrench: 0.12.1.0
3030

0 commit comments

Comments
 (0)