Skip to content

Commit cd0aff6

Browse files
Merge branch 'develop-2.0.0' into fix/2.x/mttb-1080/network-object-length-serialization
2 parents 0b100cc + 6083210 commit cd0aff6

9 files changed

+474
-50
lines changed

.yamato/project.metafile

Lines changed: 3 additions & 3 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
40+
image: package-ci/ubuntu-22.04:v4.71.0
4141
flavor: b1.large
4242
standalone: StandaloneLinux64
4343
desktop:
4444
- name: ubuntu
4545
type: Unity::VM
46-
image: package-ci/ubuntu-22.04:v4
46+
image: package-ci/ubuntu-22.04:v4.71.0
4747
flavor: b1.large
4848
standalone: StandaloneLinux64
4949
model: rtx2080
@@ -186,4 +186,4 @@ projects:
186186
has_tests: false
187187
- name: testproject-tools-integration
188188
path: testproject-tools-integration
189-
has_tests: true
189+
has_tests: true

.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.10.47.0
54+
UPMPVP_CONTEXT_WRENCH: 0.10.48.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.10.47.0
57+
Wrench: 0.10.48.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.10.47.0
27+
Wrench: 0.10.48.0
2828

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

Lines changed: 185 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@ all_preview_apv_jobs:
1414
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_macos
1515
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_ubuntu
1616
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_windows
17+
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_macos
18+
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_ubuntu
19+
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_3_-_windows
1720
metadata:
1821
Job Maintainers: '#rm-packageworks'
19-
Wrench: 0.10.47.0
22+
Wrench: 0.10.48.0
2023

2124
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
2225
preview_apv_-_6000_0_-_macos:
@@ -67,10 +70,10 @@ preview_apv_-_6000_0_-_macos:
6770
dependencies:
6871
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
6972
variables:
70-
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
73+
UPMPVP_CONTEXT_WRENCH: 0.10.48.0
7174
metadata:
7275
Job Maintainers: '#rm-packageworks'
73-
Wrench: 0.10.47.0
76+
Wrench: 0.10.48.0
7477

7578
# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
7679
preview_apv_-_6000_0_-_ubuntu:
@@ -121,10 +124,10 @@ preview_apv_-_6000_0_-_ubuntu:
121124
dependencies:
122125
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
123126
variables:
124-
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
127+
UPMPVP_CONTEXT_WRENCH: 0.10.48.0
125128
metadata:
126129
Job Maintainers: '#rm-packageworks'
127-
Wrench: 0.10.47.0
130+
Wrench: 0.10.48.0
128131

129132
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
130133
preview_apv_-_6000_0_-_windows:
@@ -176,10 +179,10 @@ preview_apv_-_6000_0_-_windows:
176179
dependencies:
177180
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
178181
variables:
179-
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
182+
UPMPVP_CONTEXT_WRENCH: 0.10.48.0
180183
metadata:
181184
Job Maintainers: '#rm-packageworks'
182-
Wrench: 0.10.47.0
185+
Wrench: 0.10.48.0
183186

184187
# Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
185188
preview_apv_-_6000_1_-_macos:
@@ -230,10 +233,10 @@ preview_apv_-_6000_1_-_macos:
230233
dependencies:
231234
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
232235
variables:
233-
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
236+
UPMPVP_CONTEXT_WRENCH: 0.10.48.0
234237
metadata:
235238
Job Maintainers: '#rm-packageworks'
236-
Wrench: 0.10.47.0
239+
Wrench: 0.10.48.0
237240

238241
# Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
239242
preview_apv_-_6000_1_-_ubuntu:
@@ -284,10 +287,10 @@ preview_apv_-_6000_1_-_ubuntu:
284287
dependencies:
285288
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
286289
variables:
287-
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
290+
UPMPVP_CONTEXT_WRENCH: 0.10.48.0
288291
metadata:
289292
Job Maintainers: '#rm-packageworks'
290-
Wrench: 0.10.47.0
293+
Wrench: 0.10.48.0
291294

292295
# Functional tests for dependents found in the latest 6000.1 manifest (Windows).
293296
preview_apv_-_6000_1_-_windows:
@@ -339,10 +342,10 @@ preview_apv_-_6000_1_-_windows:
339342
dependencies:
340343
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
341344
variables:
342-
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
345+
UPMPVP_CONTEXT_WRENCH: 0.10.48.0
343346
metadata:
344347
Job Maintainers: '#rm-packageworks'
345-
Wrench: 0.10.47.0
348+
Wrench: 0.10.48.0
346349

347350
# Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
348351
preview_apv_-_6000_2_-_macos:
@@ -393,10 +396,10 @@ preview_apv_-_6000_2_-_macos:
393396
dependencies:
394397
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
395398
variables:
396-
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
399+
UPMPVP_CONTEXT_WRENCH: 0.10.48.0
397400
metadata:
398401
Job Maintainers: '#rm-packageworks'
399-
Wrench: 0.10.47.0
402+
Wrench: 0.10.48.0
400403

401404
# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
402405
preview_apv_-_6000_2_-_ubuntu:
@@ -447,10 +450,10 @@ preview_apv_-_6000_2_-_ubuntu:
447450
dependencies:
448451
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
449452
variables:
450-
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
453+
UPMPVP_CONTEXT_WRENCH: 0.10.48.0
451454
metadata:
452455
Job Maintainers: '#rm-packageworks'
453-
Wrench: 0.10.47.0
456+
Wrench: 0.10.48.0
454457

455458
# Functional tests for dependents found in the latest 6000.2 manifest (Windows).
456459
preview_apv_-_6000_2_-_windows:
@@ -502,8 +505,171 @@ preview_apv_-_6000_2_-_windows:
502505
dependencies:
503506
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
504507
variables:
505-
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
508+
UPMPVP_CONTEXT_WRENCH: 0.10.48.0
506509
metadata:
507510
Job Maintainers: '#rm-packageworks'
508-
Wrench: 0.10.47.0
511+
Wrench: 0.10.48.0
512+
513+
# Functional tests for dependents found in the latest 6000.3 manifest (MacOS).
514+
preview_apv_-_6000_3_-_macos:
515+
name: Preview APV - 6000.3 - macos
516+
agent:
517+
image: package-ci/macos-13:default
518+
type: Unity::VM::osx
519+
flavor: b1.xlarge
520+
commands:
521+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-61_6af0746012fdbe27c8d9841fcad8f97465d1943826d6884e6aabf0d289b83093.zip -o wrench-localapv.zip
522+
- command: 7z x -aoa wrench-localapv.zip
523+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
524+
- command: python PythonScripts/print_machine_info.py
525+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
526+
timeout: 20
527+
retries: 10
528+
- command: unity-downloader-cli -u 6000.3 -c Editor --fast
529+
timeout: 10
530+
retries: 3
531+
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
532+
- command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
533+
after:
534+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-mac.sh
535+
artifacts:
536+
Crash Dumps:
537+
paths:
538+
- CrashDumps/**
539+
logs:
540+
paths:
541+
- '*.log'
542+
- '*.xml'
543+
- upm-ci~/test-results/**/*
544+
- upm-ci~/temp/*/Logs/**
545+
- upm-ci~/temp/*/Library/*.log
546+
- upm-ci~/temp/*/*.log
547+
- upm-ci~/temp/Builds/*.log
548+
packages:
549+
paths:
550+
- upm-ci~/packages/**/*
551+
PreviewAPVResults:
552+
paths:
553+
- PreviewApvArtifacts~/**
554+
- APVTest/**/manifest.json
555+
pvp-results:
556+
paths:
557+
- upm-ci~/pvp/**/*
558+
browsable: onDemand
559+
dependencies:
560+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
561+
variables:
562+
UPMPVP_CONTEXT_WRENCH: 0.10.48.0
563+
metadata:
564+
Job Maintainers: '#rm-packageworks'
565+
Wrench: 0.10.48.0
566+
567+
# Functional tests for dependents found in the latest 6000.3 manifest (Ubuntu).
568+
preview_apv_-_6000_3_-_ubuntu:
569+
name: Preview APV - 6000.3 - ubuntu
570+
agent:
571+
image: package-ci/ubuntu-20.04:default
572+
type: Unity::VM
573+
flavor: b1.large
574+
commands:
575+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-61_6af0746012fdbe27c8d9841fcad8f97465d1943826d6884e6aabf0d289b83093.zip -o wrench-localapv.zip
576+
- command: 7z x -aoa wrench-localapv.zip
577+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
578+
- command: python PythonScripts/print_machine_info.py
579+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
580+
timeout: 20
581+
retries: 10
582+
- command: unity-downloader-cli -u 6000.3 -c Editor --fast
583+
timeout: 10
584+
retries: 3
585+
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
586+
- command: echo 'Skipping Editor Manifest Validator as it is only supported on Windows'
587+
after:
588+
- command: bash .yamato/generated-scripts/infrastructure-instability-detection-linux.sh
589+
artifacts:
590+
Crash Dumps:
591+
paths:
592+
- CrashDumps/**
593+
logs:
594+
paths:
595+
- '*.log'
596+
- '*.xml'
597+
- upm-ci~/test-results/**/*
598+
- upm-ci~/temp/*/Logs/**
599+
- upm-ci~/temp/*/Library/*.log
600+
- upm-ci~/temp/*/*.log
601+
- upm-ci~/temp/Builds/*.log
602+
packages:
603+
paths:
604+
- upm-ci~/packages/**/*
605+
PreviewAPVResults:
606+
paths:
607+
- PreviewApvArtifacts~/**
608+
- APVTest/**/manifest.json
609+
pvp-results:
610+
paths:
611+
- upm-ci~/pvp/**/*
612+
browsable: onDemand
613+
dependencies:
614+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
615+
variables:
616+
UPMPVP_CONTEXT_WRENCH: 0.10.48.0
617+
metadata:
618+
Job Maintainers: '#rm-packageworks'
619+
Wrench: 0.10.48.0
620+
621+
# Functional tests for dependents found in the latest 6000.3 manifest (Windows).
622+
preview_apv_-_6000_3_-_windows:
623+
name: Preview APV - 6000.3 - windows
624+
agent:
625+
image: package-ci/win10:default
626+
type: Unity::VM
627+
flavor: b1.large
628+
commands:
629+
- command: gsudo reg add "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\FileSystem" /v LongPathsEnabled /t REG_DWORD /d 1 /f
630+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-61_6af0746012fdbe27c8d9841fcad8f97465d1943826d6884e6aabf0d289b83093.zip -o wrench-localapv.zip
631+
- command: 7z x -aoa wrench-localapv.zip
632+
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
633+
- command: python PythonScripts/print_machine_info.py
634+
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
635+
timeout: 20
636+
retries: 10
637+
- command: unity-downloader-cli -u 6000.3 -c Editor --fast
638+
timeout: 10
639+
retries: 3
640+
- command: python PythonScripts/preview_apv.py --wrench-config=.yamato/wrench/wrench_config.json --editor-version=6000.3 --testsuite=editor,playmode --artifacts-path=PreviewApvArtifacts~
641+
- command: python PythonScripts/editor_manifest_validator.py --version=6000.3 --wrench-config=.yamato/wrench/wrench_config.json
642+
after:
643+
- command: .yamato\generated-scripts\infrastructure-instability-detection-win.cmd
644+
artifacts:
645+
Crash Dumps:
646+
paths:
647+
- CrashDumps/**
648+
logs:
649+
paths:
650+
- '*.log'
651+
- '*.xml'
652+
- upm-ci~/test-results/**/*
653+
- upm-ci~/temp/*/Logs/**
654+
- upm-ci~/temp/*/Library/*.log
655+
- upm-ci~/temp/*/*.log
656+
- upm-ci~/temp/Builds/*.log
657+
packages:
658+
paths:
659+
- upm-ci~/packages/**/*
660+
PreviewAPVResults:
661+
paths:
662+
- PreviewApvArtifacts~/**
663+
- APVTest/**/manifest.json
664+
pvp-results:
665+
paths:
666+
- upm-ci~/pvp/**/*
667+
browsable: onDemand
668+
dependencies:
669+
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
670+
variables:
671+
UPMPVP_CONTEXT_WRENCH: 0.10.48.0
672+
metadata:
673+
Job Maintainers: '#rm-packageworks'
674+
Wrench: 0.10.48.0
509675

0 commit comments

Comments
 (0)