Skip to content

Commit f45883d

Browse files
NoelStephensUnityNoelStephensUnity
authored
Merge branch 'develop-2.0.0' into fix/mttb-1041-objects-without-observers-are-destroy-with-owner
2 parents 65fea48 + e0da299 commit f45883d

File tree

10 files changed

+113
-59
lines changed

10 files changed

+113
-59
lines changed

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

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Builds are made on each supported editor as in project.metafile declaration
88
# Builds are made with different scripting backends as in project.metafile declaration
99
# ARM64 architectures are for now not considered since Windows_arm64 is recommended to use only after builds (would require separation here) and when it comes to macOS_arm64 there is problem with OpenCL not being available
10-
10+
1111
# Build phase
1212
{% for project in projects.default -%}
1313
{% for platform in test_platforms.desktop -%}
@@ -24,20 +24,21 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
2424
{% if platform.name == "ubuntu" %}
2525
- sudo apt-get update -q
2626
- sudo apt install -qy imagemagick
27+
2728
{% endif %}
2829
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
29-
30+
3031
# Platform specific UTR setup
3132
- |
3233
{% if platform.name == "win" %}
3334
curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr.bat --output utr.bat
3435
{% else %}
3536
curl -s https://artifactory.prd.it.unity3d.com/artifactory/unity-tools-local/utr-standalone/utr --output utr && chmod +x utr
3637
{% endif %}
37-
38+
3839
# Installing editor
3940
- unity-downloader-cli -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} --fast --wait
40-
41+
4142
# Build Player
4243
- |
4344
{% if platform.name == "win" %}
@@ -53,17 +54,17 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
5354
logs:
5455
paths:
5556
- "artifacts/**/*"
56-
57+
5758
dependencies:
5859
- .yamato/project-pack.yml#project_pack_-_{{ project.name }}_{{ platform.name }}
5960
{% endfor -%}
6061
{% endfor -%}
6162
{% endfor -%}
6263
{% endfor -%}
63-
64-
65-
66-
64+
65+
66+
67+
6768
# Run phase
6869
{% for project in projects.default -%}
6970
{% for platform in test_platforms.desktop -%}
@@ -75,6 +76,16 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
7576
type: {% if platform.name == "mac" %} {{ platform.type }} {% else %} {{ platform.type }}::GPU {% endif %}
7677
image: {{ platform.image }}
7778
flavor: {{ platform.flavor }}
79+
80+
# Set additional variables for running the echo server
81+
{% if platform.name != "win" %}
82+
variables:
83+
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+
ENSURE_CODEC_TESTS: "true"
87+
{% endif %}
88+
7889
commands:
7990
# Platform specific UTR setup
8091
- |
@@ -86,7 +97,18 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
8697
- pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
8798

8899
- unity-downloader-cli -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} --fast --wait
89-
100+
101+
# If ubuntu, run rust echo server
102+
{% if platform.name != "win" %}
103+
- git clone https://github.com/Unity-Technologies/mps-common-multiplayer-backend.git
104+
# Install rust
105+
- curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
106+
# Build the echo server
107+
- cd ./mps-common-multiplayer-backend/runtime && $HOME/.cargo/bin/cargo build --example ngo_echo_server
108+
# Run the echo server in the background - this will reuse the artifacts from the build
109+
- cd ./mps-common-multiplayer-backend/runtime && $HOME/.cargo/bin/cargo run --example ngo_echo_server -- --port $ECHO_SERVER_PORT &
110+
{% endif %}
111+
90112
# Run Standalone tests
91113
- |
92114
{% if platform.name == "win" %}

‎.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.43.0
54+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.10.43.0
57+
Wrench: 0.10.44.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.43.0
27+
Wrench: 0.10.44.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.43.0
19+
Wrench: 0.10.44.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.43.0
70+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
7171
metadata:
7272
Job Maintainers: '#rm-packageworks'
73-
Wrench: 0.10.43.0
73+
Wrench: 0.10.44.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.43.0
124+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
125125
metadata:
126126
Job Maintainers: '#rm-packageworks'
127-
Wrench: 0.10.43.0
127+
Wrench: 0.10.44.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.43.0
179+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
180180
metadata:
181181
Job Maintainers: '#rm-packageworks'
182-
Wrench: 0.10.43.0
182+
Wrench: 0.10.44.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.43.0
233+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
234234
metadata:
235235
Job Maintainers: '#rm-packageworks'
236-
Wrench: 0.10.43.0
236+
Wrench: 0.10.44.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.43.0
287+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
288288
metadata:
289289
Job Maintainers: '#rm-packageworks'
290-
Wrench: 0.10.43.0
290+
Wrench: 0.10.44.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.43.0
342+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
343343
metadata:
344344
Job Maintainers: '#rm-packageworks'
345-
Wrench: 0.10.43.0
345+
Wrench: 0.10.44.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.43.0
396+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
397397
metadata:
398398
Job Maintainers: '#rm-packageworks'
399-
Wrench: 0.10.43.0
399+
Wrench: 0.10.44.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.43.0
450+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
451451
metadata:
452452
Job Maintainers: '#rm-packageworks'
453-
Wrench: 0.10.43.0
453+
Wrench: 0.10.44.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.43.0
505+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
506506
metadata:
507507
Job Maintainers: '#rm-packageworks'
508-
Wrench: 0.10.43.0
508+
Wrench: 0.10.44.0
509509

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ publish_dry_run_netcode_gameobjects:
100100
unzip: true
101101
variables:
102102
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
103-
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
103+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
104104
metadata:
105105
Job Maintainers: '#rm-packageworks'
106-
Wrench: 0.10.43.0
106+
Wrench: 0.10.44.0
107107

108108
# Publish for netcode.gameobjects to https://artifactory-slo.bf.unity3d.com/artifactory/api/npm/upm-npm
109109
publish_netcode_gameobjects:
@@ -204,8 +204,8 @@ publish_netcode_gameobjects:
204204
unzip: true
205205
variables:
206206
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
207-
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
207+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
208208
metadata:
209209
Job Maintainers: '#rm-packageworks'
210-
Wrench: 0.10.43.0
210+
Wrench: 0.10.44.0
211211

‎.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.43.0
29+
Wrench: 0.10.44.0
3030

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_macos:
6060
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
6161
variables:
6262
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
63-
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
63+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
6464
metadata:
6565
Job Maintainers: '#rm-packageworks'
66-
Wrench: 0.10.43.0
66+
Wrench: 0.10.44.0
6767
labels:
6868
- Packages:netcode.gameobjects
6969

@@ -126,10 +126,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_ubuntu:
126126
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
127127
variables:
128128
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
129-
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
129+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
130130
metadata:
131131
Job Maintainers: '#rm-packageworks'
132-
Wrench: 0.10.43.0
132+
Wrench: 0.10.44.0
133133
labels:
134134
- Packages:netcode.gameobjects
135135

@@ -192,10 +192,10 @@ validate_-_netcode_gameobjects_-_6000_0_-_windows:
192192
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
193193
variables:
194194
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
195-
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
195+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
196196
metadata:
197197
Job Maintainers: '#rm-packageworks'
198-
Wrench: 0.10.43.0
198+
Wrench: 0.10.44.0
199199
labels:
200200
- Packages:netcode.gameobjects
201201

@@ -258,10 +258,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_macos:
258258
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
259259
variables:
260260
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
261-
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
261+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
262262
metadata:
263263
Job Maintainers: '#rm-packageworks'
264-
Wrench: 0.10.43.0
264+
Wrench: 0.10.44.0
265265
labels:
266266
- Packages:netcode.gameobjects
267267

@@ -324,10 +324,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_ubuntu:
324324
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
325325
variables:
326326
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
327-
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
327+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
328328
metadata:
329329
Job Maintainers: '#rm-packageworks'
330-
Wrench: 0.10.43.0
330+
Wrench: 0.10.44.0
331331
labels:
332332
- Packages:netcode.gameobjects
333333

@@ -390,10 +390,10 @@ validate_-_netcode_gameobjects_-_6000_1_-_windows:
390390
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
391391
variables:
392392
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
393-
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
393+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
394394
metadata:
395395
Job Maintainers: '#rm-packageworks'
396-
Wrench: 0.10.43.0
396+
Wrench: 0.10.44.0
397397
labels:
398398
- Packages:netcode.gameobjects
399399

@@ -456,10 +456,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_macos:
456456
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
457457
variables:
458458
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
459-
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
459+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
460460
metadata:
461461
Job Maintainers: '#rm-packageworks'
462-
Wrench: 0.10.43.0
462+
Wrench: 0.10.44.0
463463
labels:
464464
- Packages:netcode.gameobjects
465465

@@ -522,10 +522,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_ubuntu:
522522
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
523523
variables:
524524
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
525-
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
525+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
526526
metadata:
527527
Job Maintainers: '#rm-packageworks'
528-
Wrench: 0.10.43.0
528+
Wrench: 0.10.44.0
529529
labels:
530530
- Packages:netcode.gameobjects
531531

@@ -588,10 +588,10 @@ validate_-_netcode_gameobjects_-_6000_2_-_windows:
588588
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
589589
variables:
590590
UPMPVP_ACK_UPMPVP_DOES_NO_API_VALIDATION: 1
591-
UPMPVP_CONTEXT_WRENCH: 0.10.43.0
591+
UPMPVP_CONTEXT_WRENCH: 0.10.44.0
592592
metadata:
593593
Job Maintainers: '#rm-packageworks'
594-
Wrench: 0.10.43.0
594+
Wrench: 0.10.44.0
595595
labels:
596596
- Packages:netcode.gameobjects
597597

‎.yamato/wrench/wrench_config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
},
3232
"publishing_job": ".yamato/wrench/promotion-jobs.yml#publish_netcode_gameobjects",
3333
"branch_pattern": "ReleaseSlash",
34-
"wrench_version": "0.10.43.0",
34+
"wrench_version": "0.10.44.0",
3535
"pvp_exemption_path": ".yamato/wrench/pvp-exemptions.json",
3636
"cs_project_path": "Tools\\CI\\NGO.Cookbook.csproj"
3737
}

0 commit comments

Comments
 (0)