Skip to content

Commit 02600b9

Browse files
noellie-veleznoellie-velez
committed
Merge branch 'develop-2.0.0' into refactor/use-internal-has-authority-network-object
2 parents 76a0480 + 67e3e1c commit 02600b9

147 files changed

Lines changed: 4484 additions & 1936 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.

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ AssemblyInfo.cs @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
1010
.github/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
1111
.yamato/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
1212
com.unity.netcode.gameobjects/Documentation*/ @jabbacakes
13-
com.unity.netcode.gameobjects/Runtime/Transports/UTP/ @Unity-Technologies/multiplayer-workflows
13+
com.unity.netcode.gameobjects/Runtime/Transports/UTP/ @simon-lemay-unity

‎.github/workflows/mark-stale-issue.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,17 @@ jobs:
2222
with:
2323
# Only mark issues (not PRs) as stale
2424
any-of-labels: 'stat:awaiting-response'
25-
days-before-stale: 30
26-
days-before-close: 30
25+
days-before-stale: 14
26+
days-before-close: 14
2727
stale-issue-label: 'Stale'
2828
exempt-issue-labels: 'stat:import,stat:imported'
2929
stale-issue-message: >
3030
This issue has been automatically marked as stale because it has been awaiting
31-
response for over 30 days without any activity.
31+
response for over 2 weeks without any activity.
3232
33-
Please update the issue with any new information or it may be closed in 30 days.
33+
Please update the issue with any new information or it may be closed in 2 weeks.
3434
close-issue-message: >
35-
This issue has been automatically closed because it has been stale for 30 days
35+
This issue has been automatically closed because it has been stale for 2 weeks
3636
without any activity. Feel free to reopen if you have new information to add.
3737
# Prevent the action from marking/closing PRs
3838
days-before-pr-stale: -1

‎.github/workflows/pr-description-validation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
uses: actions/checkout@v6
2525

2626
- name: Check PR description
27-
uses: actions/github-script@v8
27+
uses: actions/github-script@v9
2828
with:
2929
script: |
3030
const pr = context.payload.pull_request;

‎.github/workflows/qa-reviewer-assignment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
steps:
2424

2525
- name: 'Assign QA Team'
26-
uses: actions/github-script@v8
26+
uses: actions/github-script@v9
2727
with:
2828
github-token: ${{ secrets.GH_TOKEN }}
2929
script: |

‎.yamato/_run-all.yml‎

Lines changed: 75 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,15 @@ run_all_package_tests_trunk:
3737
name: Run All Package Tests [Trunk only]
3838
dependencies:
3939
{% for platform in test_platforms.desktop -%}
40-
{% for editor in validation_editors.default -%}
41-
- .yamato/package-tests.yml#package_test_-_ngo_{{ editor }}_{{ platform.name }}
40+
- .yamato/package-tests.yml#package_test_-_ngo_trunk_{{ platform.name }}
4241
{% endfor -%}
42+
43+
# Runs all package tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
44+
run_all_package_tests_pinnedTrunk:
45+
name: Run All Package Tests [Pinned Trunk only]
46+
dependencies:
47+
{% for platform in test_platforms.desktop -%}
48+
- .yamato/package-tests.yml#package_test_-_ngo_{{ pinnedTrunk }}_{{ platform.name }}
4349
{% endfor -%}
4450

4551
# Runs all package tests on mimimum supported editor (6000.0 in case of NGOv2.X)
@@ -73,9 +79,19 @@ run_all_project_tests_trunk:
7379
{% for project in projects.all -%}
7480
{% if project.has_tests == "true" -%}
7581
{% for platform in test_platforms.desktop -%}
76-
{% for editor in validation_editors.default -%}
77-
- .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ editor }}
82+
- .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_trunk
7883
{% endfor -%}
84+
{% endif -%}
85+
{% endfor -%}
86+
87+
# Runs all projects tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
88+
run_all_project_tests_pinnedTrunk:
89+
name: Run All Project Tests [Pinned Trunk only]
90+
dependencies:
91+
{% for project in projects.all -%}
92+
{% if project.has_tests == "true" -%}
93+
{% for platform in test_platforms.desktop -%}
94+
- .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ pinnedTrunk }}
7995
{% endfor -%}
8096
{% endif -%}
8197
{% endfor -%}
@@ -125,10 +141,19 @@ run_all_webgl_builds_trunk:
125141
dependencies:
126142
{% for project in projects.default -%}
127143
{% for platform in test_platforms.desktop -%}
128-
{% for editor in validation_editors.default -%}
129-
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
144+
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_trunk
130145
{% endfor -%}
131146
{% endfor -%}
147+
148+
149+
# Runs all WebGL builds on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
150+
run_all_webgl_builds_pinnedTrunk:
151+
name: Run All WebGl Build [Pinned Trunk only]
152+
dependencies:
153+
{% for project in projects.default -%}
154+
{% for platform in test_platforms.desktop -%}
155+
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ pinnedTrunk }}
156+
{% endfor -%}
132157
{% endfor -%}
133158

134159
# Runs all WebGL builds on 6000.0 editor
@@ -163,12 +188,22 @@ run_all_project_tests_desktop_standalone_trunk:
163188
dependencies:
164189
{% for project in projects.default -%}
165190
{% for platform in test_platforms.desktop -%}
166-
{% for editor in validation_editors.default -%}
167191
{% for backend in scripting_backends -%}
168-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}
192+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_trunk
169193
{% endfor -%}
170194
{% endfor -%}
171195
{% endfor -%}
196+
197+
# Runs all Desktop tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
198+
run_all_project_tests_desktop_standalone_pinnedTrunk:
199+
name: Run All Standalone Tests - Desktop [Pinned Trunk only]
200+
dependencies:
201+
{% for project in projects.default -%}
202+
{% for platform in test_platforms.desktop -%}
203+
{% for backend in scripting_backends -%}
204+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ pinnedTrunk }}
205+
{% endfor -%}
206+
{% endfor -%}
172207
{% endfor -%}
173208

174209
# Runs all Desktop tests on mimimum supported editor (6000.0 in case of NGOv2.X)
@@ -202,10 +237,18 @@ run_all_project_tests_mobile_standalone_trunk:
202237
dependencies:
203238
{% for project in projects.default -%}
204239
{% for platform in test_platforms.mobile_test -%}
205-
{% for editor in validation_editors.default -%}
206-
- .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}
240+
- .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_trunk
207241
{% endfor -%}
208242
{% endfor -%}
243+
244+
# Runs all Mobile tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
245+
run_all_project_tests_mobile_standalone_pinnedTrunk:
246+
name: Run All Standalone Tests - Mobile [Pinned Trunk only]
247+
dependencies:
248+
{% for project in projects.default -%}
249+
{% for platform in test_platforms.mobile_test -%}
250+
- .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ pinnedTrunk }}
251+
{% endfor -%}
209252
{% endfor -%}
210253

211254
# Runs all Mobile tests on mimimum supported editor (6000.0 in case of NGOv2.X)
@@ -238,10 +281,18 @@ run_all_project_tests_console_standalone_trunk:
238281
dependencies:
239282
{% for project in projects.default -%}
240283
{% for platform in test_platforms.console_test -%}
241-
{% for editor in validation_editors.default -%}
242-
- .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}
284+
- .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_trunk
243285
{% endfor -%}
244286
{% endfor -%}
287+
288+
# Runs all Console tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
289+
run_all_project_tests_console_standalone_pinnedTrunk:
290+
name: Run All Standalone Tests - Console [Pinned Trunk only]
291+
dependencies:
292+
{% for project in projects.default -%}
293+
{% for platform in test_platforms.console_test -%}
294+
- .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ pinnedTrunk }}
295+
{% endfor -%}
245296
{% endfor -%}
246297

247298
# Runs all Console tests on mimimum supported editor (6000.0 in case of NGOv2.X)
@@ -281,6 +332,18 @@ run_all_project_tests_cmb_service_trunk:
281332
{% endfor -%}
282333
{% endfor -%}
283334

335+
# Runs all CMB service tests on pinned trunk editor (This is used for PR testing as we want to avoid blocking failures)
336+
run_all_project_tests_cmb_service_pinnedTrunk:
337+
name: Run All CMB Service Tests [Pinned Trunk only]
338+
dependencies:
339+
{% for project in projects.default -%}
340+
{% for platform in test_platforms.default -%}
341+
{% for backend in scripting_backends -%}
342+
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ pinnedTrunk }}
343+
{% endfor -%}
344+
{% endfor -%}
345+
{% endfor -%}
346+
284347
# Runs all CMB service tests on mimimum supported editor (6000.0 in case of NGOv2.X)
285348
run_all_project_tests_cmb_service_6000:
286349
name: Run All CMB Service Tests [6000.0]

‎.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 6000.5 and an older supported editor (6000.0)
79-
- .yamato/package-tests.yml#package_test_-_ngo_6000.5_mac
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_{{ pinnedTrunk }}_mac
8080
- .yamato/package-tests.yml#package_test_-_ngo_6000.0_win
8181

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
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_{{ pinnedTrunk }}
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 "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
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_{{ pinnedTrunk }}
91+
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_{{ pinnedTrunk }}
9292
triggers:
9393
expression: |-
9494
(pull_request.comment eq "ngo" OR

‎.yamato/package-pack.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ package_pack_-_ngo_{{ platform.name }}:
4040
{% endif %}
4141
timeout: 0.25
4242
variables:
43-
XRAY_PROFILE: "gold ./pvpExceptions.json"
43+
XRAY_PROFILE: "gold ./pvpExceptions.json rme"
4444
commands:
4545
- upm-pvp pack "com.unity.netcode.gameobjects" --output upm-ci~/packages
4646
- upm-pvp xray --packages "upm-ci~/packages/com.unity.netcode.gameobjects*.tgz" --results pvp-results

‎.yamato/package-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}:
3636
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
3737
{% endif %}
3838
variables:
39-
XRAY_PROFILE: "gold ./pvpExceptions.json"
39+
XRAY_PROFILE: "gold ./pvpExceptions.json rme"
4040
UNITY_EXT_LOGGING: 1
4141
commands:
4242
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models.

‎.yamato/project.metafile‎

Lines changed: 6 additions & 4 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.82.0
27+
image: package-ci/ubuntu-22.04:v4.85.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.82.0
42+
image: package-ci/ubuntu-22.04:v4.85.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.82.0
48+
image: package-ci/ubuntu-22.04:v4.85.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
@@ -181,8 +181,10 @@ validation_editors:
181181
- 6000.4
182182
- 6000.5
183183
- trunk
184+
- f1298548e194f35ff7dfa6fee699d4464ab3919c
184185
minimal:
185186
- 6000.0
187+
pinnedTrunk: f1298548e194f35ff7dfa6fee699d4464ab3919c
186188

187189

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

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
### Auto-generated by Recipe Engine, DO NOT EDIT. ###
44
### ###
55
#######################################################
6+
# Source: RecipeEngine.Modules.Wrench.Recipes.ApiValidationJobs
67
# This job is generated by the wrench recipe engine module, see find the docs here: http://Go/ii2fb
78
all_api_validation_jobs:
89
name: All API Validation Jobs
@@ -17,7 +18,7 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
1718
type: Unity::VM
1819
flavor: b1.large
1920
commands:
20-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-0_3978eda62a03e3dbc469ab77590d20f8832032d8e0b586550597b7f590baefec.zip -o wrench-localapv.zip
21+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-3-3_51b4e6affb4c10b90f92db9551b9dc80c5520794983600cff4fa925111db116d.zip -o wrench-localapv.zip
2122
- command: 7z x -aoa wrench-localapv.zip
2223
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
2324
- command: python PythonScripts/print_machine_info.py
@@ -59,8 +60,8 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_win10:
5960
UNITY_LICENSING_SERVER_DELETE_NUL: 0
6061
UNITY_LICENSING_SERVER_DELETE_ULF: 0
6162
UNITY_LICENSING_SERVER_TOOLSET: pro
62-
UPMPVP_CONTEXT_WRENCH: 2.3.3.0
63+
UPMPVP_CONTEXT_WRENCH: 2.9.0.0
6364
metadata:
6465
Job Maintainers: '#rm-packageworks'
65-
Wrench: 2.3.3.0
66+
Wrench: 2.9.0.0
6667

0 commit comments

Comments
 (0)