Skip to content

Commit 38163ca

Browse files
authored
Merge branch 'develop-2.0.0' into fix/serialization-docs
2 parents b785b20 + 7800803 commit 38163ca

104 files changed

Lines changed: 2479 additions & 2122 deletions

File tree

Some content is hidden

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

.yamato/project.metafile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
small_agent_platform:
2525
- name: ubuntu
2626
type: Unity::VM
27-
image: package-ci/ubuntu-22.04:v4.85.0
27+
image: package-ci/ubuntu-22.04:v4.86.0
2828
flavor: b1.small
2929

3030

@@ -39,15 +39,15 @@ test_platforms:
3939
default:
4040
- name: ubuntu
4141
type: Unity::VM
42-
image: package-ci/ubuntu-22.04:v4.85.0
42+
image: package-ci/ubuntu-22.04:v4.86.0
4343
flavor: b1.large
4444
standalone: StandaloneLinux64
4545
desktop:
4646
- name: ubuntu
4747
type: Unity::VM
48-
image: package-ci/ubuntu-22.04:v4.85.0
48+
image: package-ci/ubuntu-22.04:v4.86.0
4949
flavor: b1.large
50-
smaller_flavor: b1.medium
50+
smaller_flavor: b1.large
5151
larger_flavor: b1.xlarge
5252
standalone: StandaloneLinux64
5353
- name: win
@@ -178,13 +178,13 @@ validation_editors:
178178
all:
179179
- 6000.0
180180
- 6000.3
181-
- 6000.4
182181
- 6000.5
182+
- 6000.6
183183
- trunk
184-
- a4ce83e807ca9aff8394d1cc07341168dc49df03
184+
- f1298548e194f35ff7dfa6fee699d4464ab3919c
185185
minimal:
186186
- 6000.0
187-
pinnedTrunk: a4ce83e807ca9aff8394d1cc07341168dc49df03
187+
pinnedTrunk: f1298548e194f35ff7dfa6fee699d4464ab3919c
188188

189189

190190
# Scripting backends used by Standalone RunTimeTests---------------------------------------------------

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
6060
UNITY_LICENSING_SERVER_DELETE_NUL: 0
6161
UNITY_LICENSING_SERVER_DELETE_ULF: 0
6262
UNITY_LICENSING_SERVER_TOOLSET: pro
63-
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
63+
UPMPVP_CONTEXT_WRENCH: 3.2.0.0
6464
metadata:
6565
Job Maintainers: '#rm-packageworks'
66-
Wrench: 2.9.0.0
66+
Wrench: 3.2.0.0
6767

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@ package_pack_-_netcode_gameobjects:
2929
UPMCI_ACK_LARGE_PACKAGE: 1
3030
metadata:
3131
Job Maintainers: '#rm-packageworks'
32-
Wrench: 2.9.0.0
32+
Wrench: 3.2.0.0
3333

0 commit comments

Comments
 (0)