Skip to content

Commit e10dde7

Browse files
ashwinimurtJesse Olmer0xFA11
authored
chore: backport fixes to release1.0.0 (#1936)
* chore: Separate trunk tests and trigger weekly (#1926) * chore: Separate trunk tests and trigger weekly * Rename to weekly * Turn off badges trigger dependencies on trunk * Run Code Coverage on validation_editor 2020.3 * fix: Fix code coverage config name in nightly trigger (#1933) * docs: NetworkConfig.ClientConnectionBufferTimeout xmldoc clarifications [skip ci] (#1927) Add more detail to where in the process the setting takes effect, how it relates to transport-level timeouts and indicates that it's a server-side setting only. * chore: update `CODEOWNERS` (#1935) Co-authored-by: Jesse Olmer <[email protected]> Co-authored-by: Fatih Mar <[email protected]>
1 parent 97df049 commit e10dde7

File tree

5 files changed

+49
-6
lines changed

5 files changed

+49
-6
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# see https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners for more information
22
# Order is important; the last matching pattern takes the most precedence.
33

4+
* @Unity-Technologies/multiplayer-sdk
45
Profiling/ @Unity-Technologies/multiplayer-tools
56
Metrics/ @Unity-Technologies/multiplayer-tools
67
/com.unity.netcode.gameobjects/Runtime/Transports/ @Unity-Technologies/multiplayer-server

.yamato/_run-all.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,28 @@ run_all_tests:
1010
{% for platform in test_platforms -%}
1111
{% for project in projects -%}
1212
{% for editor in project.test_editors -%}
13+
{% if editor != "trunk" -%}
1314
{% for package in project.packages -%}
1415
- .yamato/package-tests.yml#test_{{ project.name}}_{{ package.name }}_{{ editor }}_{{ platform.name }}
1516
{% endfor -%}
1617
- .yamato/project-tests.yml#test_{{ project.name }}_{{ editor }}_{{ platform.name }}
18+
{% endif -%}
19+
{% endfor -%}
20+
{% endfor -%}
21+
{% endfor -%}
22+
23+
run_all_tests_trunk:
24+
name: Run All Package and Project Tests [Trunk]
25+
dependencies:
26+
{% for platform in test_platforms -%}
27+
{% for project in projects -%}
28+
{% for editor in project.test_editors -%}
29+
{% if editor == "trunk" -%}
30+
{% for package in project.packages -%}
31+
- .yamato/package-tests.yml#test_{{ project.name}}_{{ package.name }}_{{ editor }}_{{ platform.name }}
32+
{% endfor -%}
33+
- .yamato/project-tests.yml#test_{{ project.name }}_{{ editor }}_{{ platform.name }}
34+
{% endif -%}
1735
{% endfor -%}
1836
{% endfor -%}
1937
{% endfor -%}

.yamato/_triggers.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,19 @@ develop_nightly:
1010
dependencies:
1111
- .yamato/_run-all.yml#run_all_tests
1212
{% for project in projects -%}
13-
- .yamato/code-coverage.yml#code_coverage_win_{{ project.name }}
13+
- .yamato/code-coverage.yml#code_coverage_win_{{ project.name }}_{{ validation_editor }}
1414
{% endfor -%}
1515

16+
develop_weekly_trunk:
17+
name: "[Weekly] Run All Tests [Trunk]"
18+
triggers:
19+
recurring:
20+
- branch: develop
21+
frequency: weekly
22+
rerun: always
23+
dependencies:
24+
- .yamato/_run-all.yml#run_all_tests_trunk
25+
1626
multiprocess_nightly:
1727
name: "[Nightly] Run Multiprocess Tests"
1828
triggers:
@@ -77,9 +87,11 @@ badges_test_trigger:
7787
- .yamato/project-tests.yml#validate_{{ package.name }}_{{ test_platforms.first.name }}_{{ validation_editor }}
7888
{% endif -%}
7989
{% for editor in project.test_editors -%}
90+
{% if editor != "trunk" -%}
8091
{% for platform in test_platforms -%}
8192
- .yamato/package-tests.yml#test_{{ project.name }}_{{ package.name }}_{{ editor }}_{{ platform.name }}
8293
{% endfor -%}
94+
{% endif -%}
8395
{% endfor -%}
8496
{% endfor -%}
8597
{% endfor -%}

.yamato/code-coverage.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{% metadata_file .yamato/project.metafile %}
22
---
33
{% for project in projects -%}
4-
code_coverage_win_{{ project.name }}:
5-
name: Code Coverage Report - Windows - {{ project.name }}
4+
code_coverage_win_{{ project.name }}_{{ validation_editor }}:
5+
name: Code Coverage Report - Windows - {{ project.name }} - {{ validation_editor }}
66
agent:
77
type: Unity::VM
88
image: package-ci/win10:stable
99
flavor: b1.large
1010
commands:
1111
- pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
1212
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
13-
- unity-downloader-cli -u trunk -c editor --wait --fast
13+
- unity-downloader-cli -u {{ validation_editor }} -c editor --wait --fast
1414
- upm-ci package test -u .Editor --package-path com.unity.netcode.gameobjects --enable-code-coverage --code-coverage-options 'enableCyclomaticComplexity;generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime,+Unity.Netcode.Components'
1515
artifacts:
1616
logs:

com.unity.netcode.gameobjects/Runtime/Configuration/NetworkConfig.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,21 @@ public class NetworkConfig
5353
public uint TickRate = 30;
5454

5555
/// <summary>
56-
/// The amount of seconds to wait for handshake to complete before timing out a client
56+
/// The amount of seconds for the server to wait for the connection approval handshake to complete before the client is disconnected.
57+
///
58+
/// If the timeout is reached before approval is completed the client will be disconnected.
5759
/// </summary>
58-
[Tooltip("The amount of seconds to wait for the handshake to complete before the client times out")]
60+
/// <remarks>
61+
/// The period begins after the <see cref="NetworkEvent.Connect"/> is received on the server.
62+
/// The period ends once the server finishes processing a <see cref="ConnectionRequestMessage"/> from the client.
63+
///
64+
/// This setting is independent of any Transport-level timeouts that may be in effect. It covers the time between
65+
/// the connection being established on the Transport layer, the client sending a
66+
/// <see cref="ConnectionRequestMessage"/>, and the server processing that message through <see cref="ConnectionApproval"/>.
67+
///
68+
/// This setting is server-side only.
69+
/// </remarks>
70+
[Tooltip("The amount of seconds for the server to wait for the connection approval handshake to complete before the client is disconnected")]
5971
public int ClientConnectionBufferTimeout = 10;
6072

6173
/// <summary>

0 commit comments

Comments
 (0)