Skip to content

Commit e021c45

Browse files
ci: Update NGOv3.X CI configuration and minimal editor (#4100)
* Updated CI and editor support to latest 6000.6 Target is 6000.7 but 6000.6 should be more stable for development for now so anchoring here * Updated testproject to minimal editor * Updated minimalproject to minimal editor * Updated Examples/CharacterController to minimal editor * Updated Examples/Overriding to minimal editor * Updated Examples/PingTool to minimal editor * Corrected standards to just use minimal editor as now we pin a patch version * correction
1 parent 49e149e commit e021c45

31 files changed

Lines changed: 442 additions & 312 deletions

.yamato/_run-all.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ run_quick_checks:
1616
name: Run Quick Initial Checks
1717
dependencies:
1818
# Ensure the code is running to our current standards
19-
- .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.standards }}
19+
- .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.minimal }}
2020
# This is needed for most of the jobs to execute tests + it runs xray PVP checks (all fast checks)
2121
- .yamato/package-pack.yml#package_pack_-_ngo_win
2222

@@ -115,7 +115,7 @@ run_all_projects_standards:
115115
dependencies:
116116
{% for platform in test_platforms.default -%}
117117
{% for project in projects.all -%}
118-
{% for editor in validation_editors.standards -%}
118+
{% for editor in validation_editors.minimal -%}
119119
- .yamato/project-standards.yml#standards_{{ platform.name }}_{{ project.name }}_{{ editor }}
120120
{% endfor -%}
121121
{% endfor -%}

.yamato/_triggers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
pr_minimal_required_checks:
5252
name: Minimal PR checks
5353
dependencies:
54-
- .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.standards }}
54+
- .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.minimal }}
5555
- .yamato/package-pack.yml#package_pack_-_ngo_win
5656
triggers:
5757
expression: |-
@@ -132,7 +132,7 @@ develop_nightly:
132132
rerun: always
133133
dependencies:
134134
# Run project standards to verify package/default project
135-
- .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.standards }}
135+
- .yamato/project-standards.yml#standards_ubuntu_testproject_{{ validation_editors.minimal }}
136136
# Run APV jobs to make sure the change won't break any dependants
137137
- .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs
138138
# Run package EditMode and Playmode tests on desktop platforms on trunk and 6000.0

.yamato/project-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
{% for project in projects.all -%}
3232
{% for platform in test_platforms.default -%}
33-
{% for editor in validation_editors.standards -%}
33+
{% for editor in validation_editors.minimal -%}
3434
standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
3535
name: Standards Check - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}]
3636
agent:

.yamato/project.metafile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -176,21 +176,17 @@ test_platforms:
176176
# EDITOR CONFIGURATIONS-------------------------------------------------------------------------------
177177
# Editors to be used for testing. NGOv2.X official support started from 6000.0 editor
178178
# TODO: When a new editor will be released it should be added to this list
179-
# standards editor is used for standards check so we won't get random manifest changes due to newer editor being used
180179

181180
validation_editors:
182181
default:
183-
- 6000.3
182+
- 6000.6
184183
all:
185-
- 6000.3
186-
- 6000.5
184+
- 6000.6.0b5
187185
- 6000.6
188186
- trunk
189187
- 5fe7931aab8c4fff9274e15ef0800125c68b8d6a
190188
minimal:
191-
- 6000.0
192-
standards:
193-
- 6000.3.21f1
189+
- 6000.6.0b5
194190
pinnedTrunk: 5fe7931aab8c4fff9274e15ef0800125c68b8d6a
195191

196192

Examples/CharacterControllerMovingBodies/Packages/manifest.json

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,25 @@
22
"dependencies": {
33
"com.unity.2d.sprite": "1.0.0",
44
"com.unity.2d.tilemap": "1.0.0",
5-
"com.unity.ads": "4.4.2",
6-
"com.unity.ai.navigation": "2.0.9",
7-
"com.unity.analytics": "3.8.1",
8-
"com.unity.collab-proxy": "2.10.0",
5+
"com.unity.ads": "4.19.0",
6+
"com.unity.ai.navigation": "2.0.13",
7+
"com.unity.analytics": "3.8.2",
8+
"com.unity.collab-proxy": "2.12.4",
99
"com.unity.feature.development": "1.0.2",
1010
"com.unity.ide.rider": "3.0.38",
11-
"com.unity.ide.visualstudio": "2.0.25",
12-
"com.unity.multiplayer.center": "1.0.0",
11+
"com.unity.ide.visualstudio": "2.0.26",
12+
"com.unity.multiplayer.center": "2.0.1",
1313
"com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-3.x.x",
14-
"com.unity.purchasing": "4.12.2",
15-
"com.unity.services.multiplayer": "1.2.0",
16-
"com.unity.test-framework": "1.6.0",
17-
"com.unity.timeline": "1.8.9",
18-
"com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.10",
19-
"com.unity.transport": "2.6.0",
20-
"com.unity.ugui": "2.0.0",
21-
"com.unity.visualscripting": "1.9.7",
22-
"com.unity.xr.legacyinputhelpers": "2.1.12",
14+
"com.unity.purchasing": "5.4.1",
15+
"com.unity.services.multiplayer": "2.2.4",
16+
"com.unity.test-framework": "1.8.0",
17+
"com.unity.timeline": "6.6.0",
18+
"com.unity.transport": "6.6.0",
19+
"com.unity.ugui": "2.6.0",
20+
"com.unity.visualscripting": "1.9.11",
21+
"com.unity.xr.legacyinputhelpers": "3.0.1",
2322
"com.unity.modules.accessibility": "1.0.0",
23+
"com.unity.modules.adaptiveperformance": "1.0.0",
2424
"com.unity.modules.ai": "1.0.0",
2525
"com.unity.modules.androidjni": "1.0.0",
2626
"com.unity.modules.animation": "1.0.0",
@@ -34,10 +34,13 @@
3434
"com.unity.modules.particlesystem": "1.0.0",
3535
"com.unity.modules.physics": "1.0.0",
3636
"com.unity.modules.physics2d": "1.0.0",
37+
"com.unity.modules.physicscore2d": "1.0.0",
3738
"com.unity.modules.screencapture": "1.0.0",
3839
"com.unity.modules.terrain": "1.0.0",
3940
"com.unity.modules.terrainphysics": "1.0.0",
41+
"com.unity.modules.tetgen": "1.0.0",
4042
"com.unity.modules.tilemap": "1.0.0",
43+
"com.unity.modules.timelinefoundation": "1.0.0",
4144
"com.unity.modules.ui": "1.0.0",
4245
"com.unity.modules.uielements": "1.0.0",
4346
"com.unity.modules.umbra": "1.0.0",
@@ -47,9 +50,9 @@
4750
"com.unity.modules.unitywebrequestaudio": "1.0.0",
4851
"com.unity.modules.unitywebrequesttexture": "1.0.0",
4952
"com.unity.modules.unitywebrequestwww": "1.0.0",
53+
"com.unity.modules.vectorgraphics": "1.0.0",
5054
"com.unity.modules.vehicles": "1.0.0",
5155
"com.unity.modules.video": "1.0.0",
52-
"com.unity.modules.vr": "1.0.0",
5356
"com.unity.modules.wind": "1.0.0",
5457
"com.unity.modules.xr": "1.0.0"
5558
}

Examples/CharacterControllerMovingBodies/ProjectSettings/PackageManagerSettings.asset

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,27 @@ MonoBehaviour:
1818
m_SeeAllPackageVersions: 0
1919
m_DismissPreviewPackagesInUse: 0
2020
oneTimeWarningShown: 0
21-
oneTimeDeprecatedPopUpShown: 0
22-
m_Registries:
23-
- m_Id: main
21+
oneTimePackageErrorsPopUpShown: 0
22+
m_MainRegistry:
23+
m_Id: main
2424
m_Name:
2525
m_Url: https://packages.unity.com
2626
m_Scopes: []
2727
m_IsDefault: 1
28+
m_IsUnityRegistry: 1
2829
m_Capabilities: 7
2930
m_ConfigSource: 0
3031
m_Compliance:
3132
m_Status: 0
3233
m_Violations: []
34+
m_ScopedRegistries: []
3335
m_UserSelectedRegistryName:
3436
m_UserAddingNewScopedRegistry: 0
3537
m_RegistryInfoDraft:
3638
m_Modified: 0
3739
m_ErrorMessage:
38-
m_UserModificationsInstanceId: -924
39-
m_OriginalInstanceId: -926
40+
m_UserModificationsEntityId:
41+
m_rawData: 1099511629078
42+
m_OriginalEntityId:
43+
m_rawData: 1099511629079
4044
m_LoadAssets: 0
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!176606843 &1
4+
PhysicsCoreProjectSettings2D:
5+
m_ObjectHideFlags: 0
6+
m_PhysicsCoreSettings: {fileID: 0}

0 commit comments

Comments
 (0)