Skip to content

Commit e1bb4d2

Browse files
chore(deps): update bokken image package-ci/ubuntu-22.04 to v4.81.0 (develop) (#3838)
* chore(deps): update bokken image package-ci/ubuntu-22.04 to v4.81.0 * Updates standards and errors * Updated editors * Updated CI configuration * regenerated CI * typo * typo * standards fixes * added pragma --------- Co-authored-by: unity-renovate[bot] <120015202+unity-renovate[bot]@users.noreply.github.com> Co-authored-by: michal-chrobot <michal.chrobot@unity3d.com>
1 parent 582cdea commit e1bb4d2

Some content is hidden

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

48 files changed

+330
-253
lines changed

.yamato/_run-all.yml

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ run_all_package_tests_{{ validation_editors.default }}:
3535
name: Run All Package Tests [{{ validation_editors.default }} only]
3636
dependencies:
3737
{% for platform in test_platforms.desktop -%}
38-
{% for editor in validation_editors.default -%}
39-
- .yamato/package-tests.yml#package_test_-_ngo_{{ editor }}_{{ platform.name }}
40-
{% endfor -%}
38+
- .yamato/package-tests.yml#package_test_-_ngo_{{ validation_editors.default }}_{{ platform.name }}
4139
{% endfor -%}
4240

4341
# Runs all package tests on minimal supported editor
@@ -71,9 +69,7 @@ run_all_project_tests_{{ validation_editors.default }}:
7169
{% for project in projects.all -%}
7270
{% if project.has_tests == "true" -%}
7371
{% for platform in test_platforms.desktop -%}
74-
{% for editor in validation_editors.default -%}
75-
- .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ editor }}
76-
{% endfor -%}
72+
- .yamato/project-tests.yml#test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }}
7773
{% endfor -%}
7874
{% endif -%}
7975
{% endfor -%}
@@ -97,9 +93,7 @@ run_all_projects_standards:
9793
dependencies:
9894
{% for platform in test_platforms.default -%}
9995
{% for project in projects.all -%}
100-
{% for editor in validation_editors.default -%}
101-
- .yamato/project-standards.yml#standards_{{ platform.name }}_{{ project.name }}_{{ editor }}
102-
{% endfor -%}
96+
- .yamato/project-standards.yml#standards_{{ platform.name }}_{{ project.name }}_{{ validation_editors.default }}
10397
{% endfor -%}
10498
{% endfor -%}
10599

@@ -123,9 +117,7 @@ run_all_webgl_builds_{{ validation_editors.default }}:
123117
dependencies:
124118
{% for project in projects.default -%}
125119
{% for platform in test_platforms.desktop -%}
126-
{% for editor in validation_editors.default -%}
127-
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}
128-
{% endfor -%}
120+
- .yamato/webgl-build.yml#webgl_build_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }}
129121
{% endfor -%}
130122
{% endfor -%}
131123

@@ -161,10 +153,8 @@ run_all_project_tests_desktop_standalone_{{ validation_editors.default }}:
161153
dependencies:
162154
{% for project in projects.default -%}
163155
{% for platform in test_platforms.desktop -%}
164-
{% for editor in validation_editors.default -%}
165156
{% for backend in scripting_backends -%}
166-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ editor }}
167-
{% endfor -%}
157+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{ validation_editors.default }}
168158
{% endfor -%}
169159
{% endfor -%}
170160
{% endfor -%}
@@ -200,9 +190,7 @@ run_all_project_tests_mobile_standalone_{{ validation_editors.default }}:
200190
dependencies:
201191
{% for project in projects.default -%}
202192
{% for platform in test_platforms.mobile_test -%}
203-
{% for editor in validation_editors.default -%}
204-
- .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}
205-
{% endfor -%}
193+
- .yamato/mobile-standalone-test.yml#mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }}
206194
{% endfor -%}
207195
{% endfor -%}
208196

@@ -236,9 +224,7 @@ run_all_project_tests_console_standalone_{{ validation_editors.default }}:
236224
dependencies:
237225
{% for project in projects.default -%}
238226
{% for platform in test_platforms.console_test -%}
239-
{% for editor in validation_editors.default -%}
240-
- .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}
241-
{% endfor -%}
227+
- .yamato/console-standalone-test.yml#console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ validation_editors.default }}
242228
{% endfor -%}
243229
{% endfor -%}
244230

.yamato/_triggers.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,6 @@ pr_code_changes_checks:
109109
cancel_old_ci: true
110110

111111

112-
113-
114-
115-
116-
117112
# Run all tests on {{ validation_editors.default }} (latest supported editor) on nightly basis.
118113
# Same subset as pull_request_trigger with addition of mobile/desktop/console tests and webgl builds
119114
# Those tests are all running on {{ validation_editors.default }} (latest supported editor) since it's daily and running all of them would add a lot of overhead

.yamato/project-standards.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
4545
- dotnet format --version
4646

4747
- unity-downloader-cli --fast --wait -u {{ editor }} -c editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloads basic editor
48-
4948
- .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ project.path }} -quit # This command is used to invoke Unity in a "headless" mode. It's used to sync the project
50-
- dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --check # Runs standards check
49+
- dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix # Auto-fix formatting issues
50+
- git checkout -- {{ project.path }}/Packages/manifest.json {{ project.path }}/Packages/packages-lock.json {{ project.path }}/ProjectSettings/ProjectVersion.txt 2>/dev/null || true # Restore files that Unity may have modified (we only want to check code formatting)
51+
- 'git diff --exit-code || (echo "ERROR: Code formatting issues found. Run dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --fix locally and commit the changes." && exit 1)' # Fail if formatter made any changes
5152
{% endfor -%}
5253
{% endfor -%}
5354
{% endfor -%}

.yamato/project.metafile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
small_agent_platform:
2424
- name: ubuntu
2525
type: Unity::VM
26-
image: package-ci/ubuntu-22.04:v4.77.0
26+
image: package-ci/ubuntu-22.04:v4.81.0
2727
flavor: b1.small
2828

2929

@@ -38,13 +38,13 @@ test_platforms:
3838
default:
3939
- name: ubuntu
4040
type: Unity::VM
41-
image: package-ci/ubuntu-22.04:v4.77.0
41+
image: package-ci/ubuntu-22.04:v4.81.0
4242
flavor: b1.large
4343
standalone: StandaloneLinux64
4444
desktop:
4545
- name: ubuntu
4646
type: Unity::VM
47-
image: package-ci/ubuntu-22.04:v4.77.0
47+
image: package-ci/ubuntu-22.04:v4.81.0
4848
flavor: b1.large
4949
smaller_flavor: b1.medium
5050
standalone: StandaloneLinux64

.yamato/wrench/wrench_config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"InternalOnly": false,
1313
"NeverPublish": false,
14-
"MaxEditorVersion": "6000.2",
14+
"MaxEditorVersion": "6000.0",
1515
"coverageEnabled": false,
1616
"coverageCommands": [
1717
"generateAdditionalMetrics;generateHtmlReport;assemblyFilters:ASSEMBLY_NAME;pathReplacePatterns:@*,,**/PackageCache/,;sourcePaths:YAMATO_SOURCE_DIR/Packages;"

Tools/CI/Settings/NGOSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class NGOSettings : AnnotatedSettingsBase
2323
new PackageOptions()
2424
{
2525
ReleaseOptions = new ReleaseOptions() { IsReleasing = true },
26-
MaximumEditorVersion = "6000.2", // NGOv1.X will be deprecated in 6000.3+ so we won't run tests on higher editor versions
26+
MaximumEditorVersion = "6000.0", // NGOv1.X will be deprecated in 6000.3+ so we won't run tests on higher editor versions
2727
ValidationOptions = validationOptions
2828
}
2929
}

com.unity.netcode.gameobjects/Components/NetworkAnimator.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -533,11 +533,8 @@ static AnimationParamEnumWrapper()
533533
/// </summary>
534534
private void SpawnCleanup()
535535
{
536-
if (m_NetworkAnimatorStateChangeHandler != null)
537-
{
538-
m_NetworkAnimatorStateChangeHandler.DeregisterUpdate();
539-
m_NetworkAnimatorStateChangeHandler = null;
540-
}
536+
m_NetworkAnimatorStateChangeHandler?.DeregisterUpdate();
537+
m_NetworkAnimatorStateChangeHandler = null;
541538
}
542539

543540
public override void OnDestroy()

com.unity.netcode.gameobjects/Components/NetworkTransform.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3385,6 +3385,6 @@ private static void DeregisterForTickUpdate(NetworkTransform networkTransform)
33853385

33863386
internal interface INetworkTransformLogStateEntry
33873387
{
3388-
void AddLogEntry(NetworkTransform.NetworkTransformState networkTransformState, ulong targetClient, bool preUpdate = false);
3388+
public void AddLogEntry(NetworkTransform.NetworkTransformState networkTransformState, ulong targetClient, bool preUpdate = false);
33893389
}
33903390
}

com.unity.netcode.gameobjects/Editor/HiddenScriptEditor.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#pragma warning disable IDE0005
22
using Unity.Netcode.Components;
3+
#pragma warning restore IDE0005
34
#if UNITY_UNET_PRESENT
45
using Unity.Netcode.Transports.UNET;
56
#endif

com.unity.netcode.gameobjects/Runtime/Core/NetworkManager.cs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -608,8 +608,8 @@ internal T Value
608608
/// </summary>
609609
internal interface INetworkManagerHelper
610610
{
611-
bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false);
612-
void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false);
611+
public bool NotifyUserOfNestedNetworkManager(NetworkManager networkManager, bool ignoreNetworkManagerCache = false, bool editorTest = false);
612+
public void CheckAndNotifyUserNetworkObjectRemoved(NetworkManager networkManager, bool editorTest = false);
613613
}
614614

615615
internal delegate void ResetNetworkManagerDelegate(NetworkManager manager);
@@ -1255,11 +1255,8 @@ internal void ShutdownInternal()
12551255

12561256
CustomMessagingManager = null;
12571257

1258-
if (MessageManager != null)
1259-
{
1260-
MessageManager.Dispose();
1261-
MessageManager = null;
1262-
}
1258+
MessageManager?.Dispose();
1259+
MessageManager = null;
12631260

12641261
// We need to clean up NetworkObjects before we reset the IsServer
12651262
// and IsClient properties. This provides consistency of these two

0 commit comments

Comments
 (0)