Skip to content

Commit 8633386

Browse files
Merge branch 'develop-2.0.0' into chore/simplify-accessors-misc
2 parents 0bb1acf + 1495955 commit 8633386

Some content is hidden

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

45 files changed

+1023
-293
lines changed

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

.yamato/_triggers.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,20 +75,20 @@ pr_code_changes_checks:
7575
# Run API validation to early-detect all new APIs that would force us to release new minor version of the package. Note that for this to work the package version in package.json must correspond to "actual package state" which means that it should be higher than last released version
7676
- .yamato/vetting-test.yml#vetting_test
7777

78-
# Run package EditMode and Playmode package tests on trunk and an older supported editor (6000.0)
79-
- .yamato/package-tests.yml#package_test_-_ngo_trunk_mac
78+
# Run package EditMode and Playmode package tests on 6000.5 and an older supported editor (6000.0)
79+
- .yamato/package-tests.yml#package_test_-_ngo_6000.5_mac
8080
- .yamato/package-tests.yml#package_test_-_ngo_6000.0_win
8181

82-
# Run testproject EditMode and Playmode project tests on trunk and an older supported editor (6000.0)
83-
- .yamato/project-tests.yml#test_testproject_win_trunk
82+
# Run testproject EditMode and Playmode project tests on 6000.5 and an older supported editor (6000.0)
83+
- .yamato/project-tests.yml#test_testproject_win_6000.5
8484
- .yamato/project-tests.yml#test_testproject_mac_6000.0
8585

8686
# Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon
8787
# Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
8888
# desktop_standalone_test and cmb_service_standalone_test are both reusing desktop_standalone_build dependency so we run those in the same configuration on PRs to reduce waiting time.
89-
# Note that our daily tests will anyway run both test configurations in "minimal supported" and "trunk" configurations
90-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_trunk
91-
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_trunk
89+
# Note that our daily tests will anyway run both test configurations in "minimal supported" and "6000.5" configurations
90+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_6000.5
91+
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_6000.5
9292
triggers:
9393
expression: |-
9494
(pull_request.comment eq "ngo" OR

.yamato/project.metafile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# smaller_flavor --> An override for flavor that determines the VM size/resources for lighter weight jobs that can run on a smaller vm
1313
# larger_flavor --> An override for flavor that determines the VM size/resources for heavier weight jobs that can need a bigger vm
1414
# standalone --> Specifies the build target platform (e.g., StandaloneLinux64, Android, IOS)
15-
# model --> Defines specific hardware model requirements (e.g., rtx2080, iPhone model 13). Notice that trunk currently (19.08.2025) has 13.0 as minimal iOS version which devices below this are not supporting
15+
# model --> Defines specific hardware model requirements (e.g., iPhone model 13). Notice that trunk currently (19.08.2025) has 13.0 as minimal iOS version which devices below this are not supporting
1616
# base --> Indicates the base operating system for build operations (e.g., win, mac)
1717
# architecture --> Specifies the target CPU architecture (e.g., armv7, arm64)
1818

@@ -50,15 +50,13 @@ test_platforms:
5050
smaller_flavor: b1.medium
5151
larger_flavor: b1.xlarge
5252
standalone: StandaloneLinux64
53-
model: rtx2080
5453
- name: win
5554
type: Unity::VM
5655
image: package-ci/win10:v4
5756
flavor: b1.large
5857
smaller_flavor: b1.medium
5958
larger_flavor: b1.xlarge
6059
standalone: StandaloneWindows64
61-
model: rtx2080
6260
- name: mac
6361
type: Unity::VM::osx
6462
image: package-ci/macos-13-arm64:v4 # ARM64 to support M1 model (below)
@@ -181,6 +179,7 @@ validation_editors:
181179
- 6000.0
182180
- 6000.3
183181
- 6000.4
182+
- 6000.5
184183
- trunk
185184
minimal:
186185
- 6000.0

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# Auto-generated by Recipe Engine, do not modify manually.
1+
#######################################################
2+
### ###
3+
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
4+
### ###
5+
#######################################################
26
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
37
all_api_validation_jobs:
48
name: All API Validation Jobs
@@ -11,7 +15,7 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
1115
agent:
1216
image: package-ci/win10:v4
1317
type: Unity::VM
14-
flavor: b1.xlarge
18+
flavor: b1.large
1519
commands:
1620
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
1721
- command: 7z x -aoa wrench-localapv.zip
@@ -55,8 +59,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
5559
UNITY_LICENSING_SERVER_DELETE_NUL: 0
5660
UNITY_LICENSING_SERVER_DELETE_ULF: 0
5761
UNITY_LICENSING_SERVER_TOOLSET: pro
58-
UPMPVP_CONTEXT_WRENCH: 2.2.0.0
62+
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
5963
metadata:
6064
Job Maintainers: '#rm-packageworks'
61-
Wrench: 2.2.0.0
65+
Wrench: 2.3.3.0
6266

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# Auto-generated by Recipe Engine, do not modify manually.
1+
#######################################################
2+
### ###
3+
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
4+
### ###
5+
#######################################################
26
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
37

48
# Pack Netcode for GameObjects
@@ -24,5 +28,5 @@ package_pack_-_netcode_gameobjects:
2428
UPMCI_ACK_LARGE_PACKAGE: 1
2529
metadata:
2630
Job Maintainers: '#rm-packageworks'
27-
Wrench: 2.2.0.0
31+
Wrench: 2.3.3.0
2832

.yamato/wrench/player-build.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# Auto-generated by Recipe Engine, do not modify manually.
1+
#######################################################
2+
### ###
3+
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
4+
### ###
5+
#######################################################
26
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
37
{}
48

.yamato/wrench/player-test.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# Auto-generated by Recipe Engine, do not modify manually.
1+
#######################################################
2+
### ###
3+
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
4+
### ###
5+
#######################################################
26
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
37
{}
48

0 commit comments

Comments
 (0)