Skip to content

Commit 758b1ff

Browse files
NoelStephensUnityNoelStephensUnity
authored
Merge branch 'develop-2.0.0' into fix/disabling-either-physics-modules-causes-compilation-errors
2 parents 50d934a + c1f9445 commit 758b1ff

File tree

85 files changed

+1119
-818
lines changed

Some content is hidden

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

85 files changed

+1119
-818
lines changed

‎.yamato/_run-all.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,12 @@ run_all_webgl_builds_6000:
138138
name: Run All WebGl Build [6000.0]
139139
dependencies:
140140
{% for project in projects.default -%}
141-
{% 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
142141
{% 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
143143
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_6000.0
144-
{% endfor -%}
145144
{% endif -%}
146145
{% endfor -%}
146+
{% endfor -%}
147147

148148

149149
# Runs all Desktop tests

‎.yamato/_triggers.yml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
# In order to have better coverage we run desktop standalone tests with different configurations which allows to mostly cover for different platforms, scripting backends and editor versions.
4343
# This job will FIRST run "run_quick_checks" jobs (defined in _run-all.yml) since it's the dependency of project pack jobs which is on the lowest dependency tier. This runs the fastest checks (like PVP or code standards) and ONLY IF those pass it will run the rest of the tests.
4444
# This optimization allows to speed up feedback look for any "obvious" errors and save resources.
45-
# Since standards job is a part of initial checks it's not present as direct dependency here
45+
# Since standards job is a part of initial checks it's not present as direct dependency here!!!!!!!!!!!!!!!!!!!!
4646
pull_request_trigger:
4747
name: Pull Request Trigger (develop, develop-2.0.0, & release branches)
4848
dependencies:
@@ -54,9 +54,9 @@ pull_request_trigger:
5454
- .yamato/_run-all.yml#run_all_project_tests_trunk
5555
# Run project EditMode and PLaymode project tests on minimum supported editor (6000.0 in case of NGOv2.X)
5656
- .yamato/_run-all.yml#run_all_project_tests_6000
57-
# Run standalone test with mixture of parameters to make sure there are no obvious issues with most common platform (for example --fail-on-assert option is not present with package/project tests). We run 2 different combinations with different platform/editor/scripting backend.
58-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_mac_il2cpp_trunk
59-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_mono_6000.0
57+
# 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
58+
# Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs
59+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_6000.0
6060
triggers:
6161
cancel_old_ci: true
6262
pull_requests:
@@ -81,7 +81,6 @@ develop_nightly:
8181
dependencies:
8282
# Run project standards to verify package/default project
8383
- .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
84-
- .yamato/project-standards.yml#standards_ubuntu_testproject_6000.0
8584
# Run APV jobs to make sure the change won't break any dependants
8685
- .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs
8786
# Run package EditMode and Playmode tests on desktop platforms on trunk and 6000.0

‎.yamato/console-standalone-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
5555
variables:
5656
# PS4 related
5757
SCE_ORBIS_SDK_DIR: 'C:\Users\bokken\SCE\ps4_sdk_12_00'
58-
# PS5 related
58+
# PS5 related --> THIS WAS DISABLED IN PROJECT.METAFILE. SEE MTT-12118
5959
SCE_PROSPERO_SDK_DIR: 'C:\Program Files (x86)\SCE\Prospero SDKs\9.000'
6060
SHADER_COMPILER_PATH: '${SCE_PROSPERO_SDK_DIR}\target\bins'
6161
SCE_ROOT_DIR: 'C:\Program Files (x86)\SCE'
@@ -94,7 +94,7 @@ console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
9494
variables:
9595
# PS4 related
9696
SCE_ORBIS_SDK_DIR: 'C:\Users\bokken\SCE\ps4_sdk_12_00'
97-
# PS5 related
97+
# PS5 related --> THIS WAS DISABLED IN PROJECT.METAFILE. SEE MTT-12118
9898
SCE_PROSPERO_SDK_DIR: 'C:\Program Files (x86)\SCE\Prospero SDKs\9.000'
9999
SHADER_COMPILER_PATH: '${SCE_PROSPERO_SDK_DIR}\target\bins'
100100
SCE_ROOT_DIR: 'C:\Program Files (x86)\SCE'

‎.yamato/desktop-standalone-tests.yml‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# DESCRIPTION--------------------------------------------------------------------------
55
# This job is responsible for Desktop platform test validation.
66
# Those tests cover both PlayMode and EditMode tests from package test assemblies.
7-
7+
88
# CONFIGURATION STRUCTURE--------------------------------------------------------------
99
# Jobs are generated using nested loops (separate build phase and run phase). Worth noting that run phase uses the build as dependency:
1010
# 1. For all desktop platform (Windows, macOS, Ubuntu)
@@ -17,17 +17,17 @@
1717
# 1. Build Phase: Creates standalone players for desktop platforms
1818
# 2. Run Phase: Executes runtime tests on actual desktop devices
1919
# The Run phase uses build job as dependency
20-
20+
2121
# Note: More of a Unity specific but test assemblies need to be included in the build phase command
2222
# Note: All builds can be made on x64 machines since those are compatible with ARM64 target devices
2323

2424
# QUALITY THOUGHTS--------------------------------------------------------------------
2525
# TODO: consider adding all projects that have tests
2626
# To see where this job is included (in trigger job definitions) look into _triggers.yml file
27-
27+
2828
#-----------------------------------------------------------------------------------
29-
30-
29+
30+
3131
# BUILD PHASE CONFIGURATION------------------------------------------------------------------------------------
3232
{% for project in projects.default -%}
3333
{% for platform in test_platforms.desktop -%}
@@ -58,10 +58,10 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
5858
{% endfor -%}
5959
{% endfor -%}
6060
{% endfor -%}
61-
62-
63-
64-
61+
62+
63+
64+
6565
# RUN PHASE CONFIGURATION------------------------------------------------------------------------------------
6666
{% for project in projects.default -%}
6767
{% for platform in test_platforms.desktop -%}
@@ -80,22 +80,25 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
8080
# Set additional variables for running the echo server (This is needed ONLY for NGOv2.X because relates to Distributed Authority)
8181
{% if platform.name != "win" %} # Issues with win and mac are tracked in MTT-11606
8282
variables:
83+
# The echo server is a "mock" server that is only used to test encoding/decoding of messages.
84+
# It is used by the DistributedAuthorityCodecTests. These are tests that are built and maintained by the CMB service team.
8385
ECHO_SERVER_PORT: "7788"
84-
# Set this to ensure the DA codec tests will fail if they cannot connect to the echo-server
85-
# The default is to ignore the codec tests if the echo-server fails to connect
86+
# Set this to ensure the DistributedAuthorityCodecTests will fail if they cannot connect to the echo server.
87+
# The default is to ignore the codec tests if the echo server fails to connect
8688
ENSURE_CODEC_TESTS: "true"
89+
90+
# When USE_CMB_SERVICE is set to true, any C# tests configured to use the DA host will instead use the CMB service.
91+
USE_CMB_SERVICE: "true"
92+
# This is the port on which to run the full standalone CMB service.
93+
# The port needs to be different from the echo server port as two processes cannot bind to same port.
94+
CMB_SERVICE_PORT: "7799"
8795
{% endif %}
8896

8997
commands:
9098
# If ubuntu, run rust echo server (This is needed ONLY for NGOv2.X because relates to Distributed Authority)
9199
{% if platform.name != "win" %} # Issues with win and mac are tracked in MTT-11606
92-
- git clone https://github.com/Unity-Technologies/mps-common-multiplayer-backend.git
93-
# Install rust
94-
- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
95-
# Build the echo server
96-
- cd ./mps-common-multiplayer-backend/runtime && $HOME/.cargo/bin/cargo build --example ngo_echo_server
97-
# Run the echo server in the background - this will reuse the artifacts from the build
98-
- cd ./mps-common-multiplayer-backend/runtime && $HOME/.cargo/bin/cargo run --example ngo_echo_server -- --port $ECHO_SERVER_PORT &
100+
# run_cmb_service.sh builds and starts a release version of the full CMB service (along with the limited echo server)
101+
- ./Tools/CI/run_cmb_service.sh -e $ECHO_SERVER_PORT -s $CMB_SERVICE_PORT
99102
{% endif %}
100103

101104
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models

‎.yamato/project.metafile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ test_platforms:
9999
image: package-ci/win10-ps4:v4
100100
flavor: b1.large
101101
standalone: PS4
102-
- name: ps5
103-
type: Unity::VM
104-
image: package-ci/win10-ps5:v4
105-
flavor: b1.large
106-
standalone: PS5
102+
# - name: ps5 --> SEE MTT-12118
103+
# type: Unity::VM
104+
# image: package-ci/win10-ps5:v4
105+
# flavor: b1.large
106+
# standalone: PS5
107107
- name: switch
108108
type: Unity::VM
109109
image: package-ci/win10-switch:v4
@@ -125,11 +125,11 @@ test_platforms:
125125
image: package-ci/win10-ps4:v4
126126
flavor: b1.large
127127
standalone: PS4
128-
- name: ps5
129-
type: Unity::console::ps5
130-
image: package-ci/win10-ps5:v4
131-
flavor: b1.large
132-
standalone: PS5
128+
#- name: ps5 --> SEE MTT-12118
129+
# type: Unity::console::ps5
130+
# image: package-ci/win10-ps5:v4
131+
# flavor: b1.large
132+
# standalone: PS5
133133
- name: switch
134134
type: Unity::console::switch
135135
image: package-ci/win10-switch:v4

‎.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.46.0
54+
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.10.46.0
57+
Wrench: 0.10.47.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.46.0
27+
Wrench: 0.10.47.0
2828

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ all_preview_apv_jobs:
1616
- path: .yamato/wrench/preview-a-p-v.yml#preview_apv_-_6000_2_-_windows
1717
metadata:
1818
Job Maintainers: '#rm-packageworks'
19-
Wrench: 0.10.46.0
19+
Wrench: 0.10.47.0
2020

2121
# Functional tests for dependents found in the latest 6000.0 manifest (MacOS).
2222
preview_apv_-_6000_0_-_macos:
@@ -67,10 +67,10 @@ preview_apv_-_6000_0_-_macos:
6767
dependencies:
6868
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
6969
variables:
70-
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
70+
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
7171
metadata:
7272
Job Maintainers: '#rm-packageworks'
73-
Wrench: 0.10.46.0
73+
Wrench: 0.10.47.0
7474

7575
# Functional tests for dependents found in the latest 6000.0 manifest (Ubuntu).
7676
preview_apv_-_6000_0_-_ubuntu:
@@ -121,10 +121,10 @@ preview_apv_-_6000_0_-_ubuntu:
121121
dependencies:
122122
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
123123
variables:
124-
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
124+
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
125125
metadata:
126126
Job Maintainers: '#rm-packageworks'
127-
Wrench: 0.10.46.0
127+
Wrench: 0.10.47.0
128128

129129
# Functional tests for dependents found in the latest 6000.0 manifest (Windows).
130130
preview_apv_-_6000_0_-_windows:
@@ -176,10 +176,10 @@ preview_apv_-_6000_0_-_windows:
176176
dependencies:
177177
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
178178
variables:
179-
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
179+
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
180180
metadata:
181181
Job Maintainers: '#rm-packageworks'
182-
Wrench: 0.10.46.0
182+
Wrench: 0.10.47.0
183183

184184
# Functional tests for dependents found in the latest 6000.1 manifest (MacOS).
185185
preview_apv_-_6000_1_-_macos:
@@ -230,10 +230,10 @@ preview_apv_-_6000_1_-_macos:
230230
dependencies:
231231
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
232232
variables:
233-
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
233+
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
234234
metadata:
235235
Job Maintainers: '#rm-packageworks'
236-
Wrench: 0.10.46.0
236+
Wrench: 0.10.47.0
237237

238238
# Functional tests for dependents found in the latest 6000.1 manifest (Ubuntu).
239239
preview_apv_-_6000_1_-_ubuntu:
@@ -284,10 +284,10 @@ preview_apv_-_6000_1_-_ubuntu:
284284
dependencies:
285285
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
286286
variables:
287-
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
287+
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
288288
metadata:
289289
Job Maintainers: '#rm-packageworks'
290-
Wrench: 0.10.46.0
290+
Wrench: 0.10.47.0
291291

292292
# Functional tests for dependents found in the latest 6000.1 manifest (Windows).
293293
preview_apv_-_6000_1_-_windows:
@@ -339,10 +339,10 @@ preview_apv_-_6000_1_-_windows:
339339
dependencies:
340340
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
341341
variables:
342-
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
342+
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
343343
metadata:
344344
Job Maintainers: '#rm-packageworks'
345-
Wrench: 0.10.46.0
345+
Wrench: 0.10.47.0
346346

347347
# Functional tests for dependents found in the latest 6000.2 manifest (MacOS).
348348
preview_apv_-_6000_2_-_macos:
@@ -393,10 +393,10 @@ preview_apv_-_6000_2_-_macos:
393393
dependencies:
394394
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
395395
variables:
396-
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
396+
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
397397
metadata:
398398
Job Maintainers: '#rm-packageworks'
399-
Wrench: 0.10.46.0
399+
Wrench: 0.10.47.0
400400

401401
# Functional tests for dependents found in the latest 6000.2 manifest (Ubuntu).
402402
preview_apv_-_6000_2_-_ubuntu:
@@ -447,10 +447,10 @@ preview_apv_-_6000_2_-_ubuntu:
447447
dependencies:
448448
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
449449
variables:
450-
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
450+
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
451451
metadata:
452452
Job Maintainers: '#rm-packageworks'
453-
Wrench: 0.10.46.0
453+
Wrench: 0.10.47.0
454454

455455
# Functional tests for dependents found in the latest 6000.2 manifest (Windows).
456456
preview_apv_-_6000_2_-_windows:
@@ -502,8 +502,8 @@ preview_apv_-_6000_2_-_windows:
502502
dependencies:
503503
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
504504
variables:
505-
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
505+
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
506506
metadata:
507507
Job Maintainers: '#rm-packageworks'
508-
Wrench: 0.10.46.0
508+
Wrench: 0.10.47.0
509509

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,10 @@ publish_dry_run_netcode_gameobjects:
118118
ignore_artifact: true
119119
variables:
120120
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
121-
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
121+
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
122122
metadata:
123123
Job Maintainers: '#rm-packageworks'
124-
Wrench: 0.10.46.0
124+
Wrench: 0.10.47.0
125125

126126
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
127127
publish_netcode_gameobjects:
@@ -240,8 +240,8 @@ publish_netcode_gameobjects:
240240
ignore_artifact: true
241241
variables:
242242
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
243-
UPMPVP_CONTEXT_WRENCH: 0.10.46.0
243+
UPMPVP_CONTEXT_WRENCH: 0.10.47.0
244244
metadata:
245245
Job Maintainers: '#rm-packageworks'
246-
Wrench: 0.10.46.0
246+
Wrench: 0.10.47.0
247247

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.10.46.0
29+
Wrench: 0.10.47.0
3030

0 commit comments

Comments
 (0)