Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .yamato/_run-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#-----------------------------------------------------------------------------------


# This job runs the fastest checks (PVP and code standards)
# This is mainly used to quickly validate the easy mistakes before for example running PR trigger jobs (see _triggers.yml)
run_quick_checks:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ code_coverage_{{ platform.name }}_{{ editor }}:
commands:
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
- upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --unity .Editor
- UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --enable-code-coverage coverage-upload-options="reportsDir:$PWD/test-results/CoverageResults;name:NGOv1_{{ platform.name }}_{{ editor }};flags:NGOv1_{{ platform.name }}_{{ editor }};verbose" --coverage-results-path=$PWD/test-results/CoverageResults --coverage-options="generateHtmlReport;generateAdditionalMetrics;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime" --extra-editor-arg=--burst-disable-compilation --timeout={ test_timeout }} --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --artifacts-path=test-results
- UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --enable-code-coverage coverage-upload-options="reportsDir:$PWD/test-results/CoverageResults;name:NGOv1_{{ platform.name }}_{{ editor }};flags:NGOv1_{{ platform.name }}_{{ editor }};verbose" --coverage-results-path=$PWD/test-results/CoverageResults --coverage-options="generateHtmlReport;generateAdditionalMetrics;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime" --extra-editor-arg=--burst-disable-compilation --timeout={{ test_timeout }} --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --artifacts-path=test-results
artifacts:
logs:
paths:
Expand Down
2 changes: 1 addition & 1 deletion .yamato/project-builders/project-builders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ build_{{ netcodeProject[0] }}_project:
commands:
# Validate inputs passed via Yamato variables
- python Tools/scripts/BuildAutomation/validate_params.py
- echo Building {{ netcodeProject[0] }} project from branch {{ netcodeProject[1].defaultBranch }} with Unity version of %UNITY_VERSION%, Scripting backend %SCRIPTING_BACKEND_IL2CPP_MONO%, Burst %BURST_ON_OFF% for platform %PLATFORM_WIN64_MAC_ANDROID%
- echo Building {{ netcodeProject[0] }} project from branch %SAMPLE_BRANCH% with Unity version of %UNITY_VERSION%, Scripting backend %SCRIPTING_BACKEND_IL2CPP_MONO%, Burst %BURST_ON_OFF% for platform %PLATFORM_WIN64_MAC_ANDROID%

# Clone the external project repository into a specific directory. Notice that branch is also specified.
- git clone --single-branch --branch %SAMPLE_BRANCH% {{ netcodeProject[1].GithubRepo }} C:/ClonedProject
Expand Down
4 changes: 2 additions & 2 deletions com.unity.netcode.gameobjects/Runtime/HelpUrls.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ internal static class HelpUrls
public const string NetworkManager = k_BaseManualUrl + "components/core/networkmanager.html";
public const string NetworkObject = k_BaseManualUrl + "components/core/networkobject.html";
public const string NetworkAnimator = k_BaseManualUrl + "components/helper/networkanimator.html";
public const string NetworkRigidbody = k_BaseManualUrl + "advanced-topics/physics.html#networkrigidbody";
public const string NetworkRigidbody2D = k_BaseManualUrl + "advanced-topics/physics.html#networkrigidbody2d";
public const string NetworkRigidbody = k_BaseManualUrl + "components/helper/networkrigidbody.html";
public const string NetworkRigidbody2D = k_BaseManualUrl + "components/helper/networkrigidbody.html#networkrigidbody2d";
public const string NetworkTransform = k_BaseManualUrl + "components/helper/networktransform.html";
public const string AnticipatedNetworkTransform = k_BaseManualUrl + "advanced-topics/client-anticipation.html";
public const string UnityTransport = k_BaseApiUrl + ".Transports.UTP.UnityTransport.html";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1048,7 +1048,10 @@ private void ExtractNetworkMetrics()
continue;
}
var transportClientId = NetworkManager.ConnectionManager.ClientIdToTransportId(ngoConnectionId);
ExtractNetworkMetricsForClient(transportClientId);
if (transportClientId.Item2)
{
ExtractNetworkMetricsForClient(transportClientId.Item1);
}
}
}
else
Expand Down
Loading