Skip to content

Commit 5566204

Browse files
Merge branch 'develop' into add-documentation-filter
2 parents 89dda85 + b6d32f0 commit 5566204

33 files changed

+462
-226
lines changed

.github/CODEOWNERS

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# Order is important; the last matching pattern takes the most precedence.
33

44
* @Unity-Technologies/multiplayer-sdk
5-
*.asmdef @miniwolf @NoelStephensUnity @fluong6 @michalChrobot @EmandM
6-
package.json @miniwolf @NoelStephensUnity @fluong6 @michalChrobot @EmandM
7-
AssemblyInfo.cs @miniwolf @NoelStephensUnity @fluong6 @michalChrobot @EmandM
8-
.editorconfig @miniwolf @NoelStephensUnity @fluong6 @michalChrobot @EmandM
9-
.gitignore @miniwolf @NoelStephensUnity @fluong6 @michalChrobot @EmandM
10-
.github/ @miniwolf @NoelStephensUnity @fluong6 @michalChrobot @EmandM
11-
.yamato/ @miniwolf @NoelStephensUnity @fluong6 @michalChrobot @EmandM
5+
*.asmdef @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
6+
package.json @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
7+
AssemblyInfo.cs @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
8+
.editorconfig @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
9+
.gitignore @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
10+
.github/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa
11+
.yamato/ @NoelStephensUnity @EmandM @Unity-Technologies/netcode-qa

.yamato/_run-all.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,11 @@ run_all_webgl_builds:
102102
dependencies:
103103
{% for project in projects.default -%}
104104
{% for platform in test_platforms.desktop -%}
105+
{% 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
105106
{% for editor in validation_editors.all -%}
106107
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
107108
{% endfor -%}
109+
{% endif -%}
108110
{% endfor -%}
109111
{% endfor -%}
110112

@@ -115,9 +117,11 @@ run_all_webgl_builds_trunk:
115117
dependencies:
116118
{% for project in projects.default -%}
117119
{% for platform in test_platforms.desktop -%}
120+
{% 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
118121
{% for editor in validation_editors.default -%}
119122
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
120123
{% endfor -%}
124+
{% endif -%}
121125
{% endfor -%}
122126
{% endfor -%}
123127

@@ -127,7 +131,9 @@ run_all_webgl_builds_2021:
127131
dependencies:
128132
{% for project in projects.default -%}
129133
{% for platform in test_platforms.desktop -%}
134+
{% 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
130135
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_2021.3
136+
{% endif -%}
131137
{% endfor -%}
132138
{% endfor -%}
133139

.yamato/webgl-build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
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
2829
{% for editor in validation_editors.all -%}
2930
webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3031
name: WebGl Build - {{ project.name }} [{{ platform.name }}, {{ editor }}, il2cpp]
@@ -37,7 +38,7 @@ webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3738
{% endif %}
3839
commands:
3940
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c webgl -c il2cpp {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloading the editor with additional webgl and il2cpp components
40-
41+
4142
# The following step builds the player with defined options such as:
4243
# Suite parameter if defined since it's a mandatory field to define which test suite should be used, but it doesn't matter in this case since we won't run any tests (--suite)
4344
# Editor is run in batchmode, which means that Unity runs command line arguments without the need for human interaction. It also suppresses pop-up windows that require human interaction (such as the Save Scene window). We should always run Unity in batch mode when using command line arguments, because it allows automation to run without interruption. (--extra-editor-arg=-batchmode)
@@ -51,5 +52,6 @@ webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
5152
- "artifacts/**/*"
5253
- "build/players/**/*"
5354
{% endfor -%}
55+
{% endif -%}
5456
{% endfor -%}
5557
{% endfor -%}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ api_validation_-_netcode_gameobjects_-_2021_3_-_windows:
1313
type: Unity::VM
1414
flavor: b1.large
1515
commands:
16-
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-59_594aea2e5eb3a7468ad88458b5c5da2e5e72af0d2267db7b025602fb69e57bd7.zip -o wrench-localapv.zip
16+
- command: curl https://artifactory.prd.it.unity3d.com/artifactory/stevedore-unity-internal/wrench-localapv/1-2-60_641f75ebc79901fc7eb7880e924d4adc41d99ad42d02aa320814a9e1e75463c4.zip -o wrench-localapv.zip
1717
- command: 7z x -aoa wrench-localapv.zip
1818
- command: pip install semver requests --index-url https://artifactory-slo.bf.unity3d.com/artifactory/api/pypi/pypi/simple
1919
- command: python PythonScripts/print_machine_info.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.10.44.0
54+
UPMPVP_CONTEXT_WRENCH: 0.10.45.0
5555
metadata:
5656
Job Maintainers: '#rm-packageworks'
57-
Wrench: 0.10.44.0
57+
Wrench: 0.10.45.0
5858

.yamato/wrench/package-pack-jobs.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ package_pack_-_netcode_gameobjects:
2424
UPMCI_ACK_LARGE_PACKAGE: 1
2525
metadata:
2626
Job Maintainers: '#rm-packageworks'
27-
Wrench: 0.10.44.0
28-
27+
Wrench: 0.10.45.0
2928

0 commit comments

Comments
 (0)