Skip to content

Commit 7bfa720

Browse files
Merge branch 'develop-2.0.0' into fix/avoid-unnecessry-gc-alloc
2 parents 6f25abe + 6b9f9b5 commit 7bfa720

File tree

433 files changed

+16339
-1787
lines changed

Some content is hidden

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

433 files changed

+16339
-1787
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ AssemblyInfo.cs @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
99
.gitignore @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
1010
.github/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
1111
.yamato/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
12+
com.unity.netcode.gameobjects/Documentation*/ @jabbacakes

.github/codecov.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
codecov:
2+
require_ci_to_pass: false
3+
notify:
4+
wait_for_ci: true
5+
6+
coverage:
7+
precision: 2
8+
round: down
9+
range: "50...70"
10+
status:
11+
patch:
12+
default:
13+
if_ci_failed: success
14+
informational: true
15+
default_rules:
16+
flag_coverage_not_uploaded_behavior: exclude
17+
project:
18+
default:
19+
target: auto
20+
# Threshold used for the PR Check
21+
threshold: 0.5%
22+
base: auto
23+
if_ci_failed: success
24+
informational: true
25+
only_pulls: true
26+
27+
# PR Comment configuration
28+
comment:
29+
layout: "diff, flags, files, components"
30+
behavior: default
31+
require_changes: false
32+
require_base: false
33+
require_head: false
34+
# Set this to the number of coverage jobs run in the PR
35+
after_n_builds: 1
36+
37+
flag_management:
38+
default_rules:
39+
carryforward: true
40+
41+
# Components configuration
42+
component_management:
43+
individual_components:
44+
- component_id: "com.unity.netcode.gameobjects"
45+
name: "com.unity.netcode.gameobjects"
46+
paths:
47+
- com.unity.netcode.gameobjects

.yamato/_run-all.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,9 @@ run_all_webgl_builds:
110110
dependencies:
111111
{% for project in projects.default -%}
112112
{% for platform in test_platforms.desktop -%}
113-
{% 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
114113
{% for editor in validation_editors.all -%}
115114
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
116115
{% endfor -%}
117-
{% endif -%}
118116
{% endfor -%}
119117
{% endfor -%}
120118

@@ -125,11 +123,9 @@ run_all_webgl_builds_trunk:
125123
dependencies:
126124
{% for project in projects.default -%}
127125
{% for platform in test_platforms.desktop -%}
128-
{% 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
129126
{% for editor in validation_editors.default -%}
130127
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
131128
{% endfor -%}
132-
{% endif -%}
133129
{% endfor -%}
134130
{% endfor -%}
135131

@@ -139,9 +135,7 @@ run_all_webgl_builds_6000:
139135
dependencies:
140136
{% for project in projects.default -%}
141137
{% 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
143138
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_6000.0
144-
{% endif -%}
145139
{% endfor -%}
146140
{% endfor -%}
147141

.yamato/code-coverage.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
# In order to properly use -coverage-results-path parameter we need to start it with $PWD (which means the absolute path). Otherwise coverage results will not be visible
2222

2323
# QUALITY CONSIDERATIONS--------------------------------------------------------------------
24-
# TODO: somewhere in 2025 we will be able to upload resuls to CodeCov from public repos
2524
# To see where this job is included (in trigger job definitions) look into _triggers.yml file
2625

2726

@@ -40,7 +39,7 @@ code_coverage_{{ platform.name }}_{{ editor }}:
4039
commands:
4140
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
4241
- upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --unity .Editor
43-
- UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --enable-code-coverage -coverage-results-path=$PWD/test-results/CodeCoverage --coverage-options="generateHtmlReport;generateAdditionalMetrics;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime" --extra-editor-arg=--burst-disable-compilation --timeout=1800 --reruncount=1 --clean-library-on-rerun --artifacts-path=test-results
42+
- UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --enable-code-coverage coverage-upload-options="reportsDir:$PWD/test-results/CoverageResults;name:NGOv2_{{ platform.name }}_{{ editor }};flags:NGOv2_{{ 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=1800 --reruncount=1 --clean-library-on-rerun --artifacts-path=test-results
4443
artifacts:
4544
logs:
4645
paths:

.yamato/project.metafile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ test_platforms:
3737
default:
3838
- name: ubuntu
3939
type: Unity::VM
40-
image: package-ci/ubuntu-22.04:v4.71.0
40+
image: package-ci/ubuntu-22.04:v4
4141
flavor: b1.large
4242
standalone: StandaloneLinux64
4343
desktop:
4444
- name: ubuntu
4545
type: Unity::VM
46-
image: package-ci/ubuntu-22.04:v4.71.0
46+
image: package-ci/ubuntu-22.04:v4
4747
flavor: b1.large
4848
standalone: StandaloneLinux64
4949
model: rtx2080

.yamato/webgl-build.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@
2626

2727
{% for project in projects.default -%}
2828
{% for platform in test_platforms.desktop -%}
29-
{% 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
3029
{% for editor in validation_editors.all -%}
3130
webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3231
name: WebGl Build - {{ project.name }} [{{ platform.name }}, {{ editor }}, il2cpp]
3332
agent:
3433
type: {{ platform.type }}
3534
image: {{ platform.image }}
36-
flavor: {{ platform.flavor }}
35+
flavor: b1.xlarge # We use b1.xlarge for WebGL builds since it requires more resources (otherwise it hangs and timeouts) especially on Ubuntu platform
3736
{% if platform.model %}
3837
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
3938
{% endif %}
@@ -53,6 +52,5 @@ webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
5352
- "artifacts/**/*"
5453
- "build/players/**/*"
5554
{% endfor -%}
56-
{% endif -%}
5755
{% endfor -%}
5856
{% endfor -%}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ api_validation_-_netcode_gameobjects_-_6000_0_-_windows:
2020
- command: npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
2121
timeout: 20
2222
retries: 10
23-
- command: unity-downloader-cli -u 6000.0/staging -c Editor --fast
23+
- command: unity-downloader-cli -u 6000.0/staging -c editor --path .Editor --fast
2424
timeout: 10
2525
retries: 3
2626
- command: python PythonScripts/PackageJsonCondersor.py
@@ -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.11.3.0
54+
UPMPVP_CONTEXT_WRENCH: 0.12.2.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.11.3.0
57+
Wrench: 0.12.2.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.11.3.0
27+
Wrench: 0.12.2.0
2828

0 commit comments

Comments
 (0)