Skip to content

Commit 2f6e473

Browse files
authored
Merge branch 'develop' into develop-docs
2 parents 007211c + 0691c84 commit 2f6e473

File tree

97 files changed

+3374
-3812
lines changed

Some content is hidden

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

97 files changed

+3374
-3812
lines changed

.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
@@ -109,11 +109,9 @@ run_all_webgl_builds:
109109
dependencies:
110110
{% for project in projects.default -%}
111111
{% for platform in test_platforms.desktop -%}
112-
{% 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
113112
{% for editor in validation_editors.all -%}
114113
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
115114
{% endfor -%}
116-
{% endif -%}
117115
{% endfor -%}
118116
{% endfor -%}
119117

@@ -124,11 +122,9 @@ run_all_webgl_builds_trunk:
124122
dependencies:
125123
{% for project in projects.default -%}
126124
{% for platform in test_platforms.desktop -%}
127-
{% 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
128125
{% for editor in validation_editors.default -%}
129126
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
130127
{% endfor -%}
131-
{% endif -%}
132128
{% endfor -%}
133129
{% endfor -%}
134130

@@ -138,9 +134,7 @@ run_all_webgl_builds_2021:
138134
dependencies:
139135
{% for project in projects.default -%}
140136
{% for platform in test_platforms.desktop -%}
141-
{% 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
142137
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_2021.3
143-
{% endif -%}
144138
{% endfor -%}
145139
{% endfor -%}
146140

.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

@@ -39,7 +38,7 @@ code_coverage_{{ platform.name }}_{{ editor }}:
3938
commands:
4039
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
4140
- upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --unity .Editor
42-
- 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
41+
- 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=1800 --reruncount=1 --clean-library-on-rerun --artifacts-path=test-results
4342
artifacts:
4443
logs:
4544
paths:

.yamato/project.metafile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
small_agent_platform:
2323
- name: ubuntu
2424
type: Unity::VM
25-
image: package-ci/ubuntu-22.04:v4.71.0
25+
image: package-ci/ubuntu-22.04:v4
2626
flavor: b1.small
2727

2828

@@ -37,7 +37,7 @@ 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:

.yamato/webgl-build.yml

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

2626
{% for project in projects.default -%}
2727
{% for platform in test_platforms.desktop -%}
28-
{% 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
2928
{% for editor in validation_editors.all -%}
3029
webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3130
name: WebGl Build - {{ project.name }} [{{ platform.name }}, {{ editor }}, il2cpp]
3231
agent:
3332
type: {{ platform.type }}
3433
image: {{ platform.image }}
35-
flavor: {{ platform.flavor }}
34+
flavor: b1.xlarge # We use b1.xlarge for WebGL builds since it requires more resources (otherwise it timeouts) especially on Ubuntu platform
3635
{% if platform.model %}
3736
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
3837
{% endif %}
@@ -52,6 +51,5 @@ webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
5251
- "artifacts/**/*"
5352
- "build/players/**/*"
5453
{% endfor -%}
55-
{% endif -%}
5654
{% endfor -%}
5755
{% 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_-_2021_3_-_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 2021.3/staging -c Editor --fast
23+
- command: unity-downloader-cli -u 2021.3/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_-_2021_3_-_windows:
5151
dependencies:
5252
- path: .yamato/wrench/package-pack-jobs.yml#package_pack_-_netcode_gameobjects
5353
variables:
54-
UPMPVP_CONTEXT_WRENCH: 0.11.2.0
54+
UPMPVP_CONTEXT_WRENCH: 0.12.1.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.11.2.0
57+
Wrench: 0.12.1.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.2.0
27+
Wrench: 0.12.1.0
2828

0 commit comments

Comments
 (0)