Skip to content

Commit 843c8b2

Browse files
ci: Added testing with latest N4E changes on Prs (#4178)
Add unified testing with latest N4E to PRs Co-authored-by: Emma <emma.mcmillan@unity3d.com>
1 parent 0d50be1 commit 843c8b2

3 files changed

Lines changed: 5 additions & 6 deletions

File tree

‎.yamato/_triggers.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@ pr_code_changes_checks:
9292
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_{{ validation_editors.default }}
9393
# Run code coverage test
9494
- .yamato/code-coverage.yml#code_coverage_project_test_testproject_ubuntu_{{ validation_editors.default }}
95+
# Run unified tests against N4E from unity/unity trunk
96+
- .yamato/unified-tests.yml#unified_test_testproject_ubuntu_{{ validation_editors.default }}
9597
triggers:
9698
expression: |-
9799
(pull_request.comment eq "ngo" OR

‎.yamato/unified-tests.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
# 2. For all unified editors (currently a single pinned alpha, see project.metafile)
1111

1212
# QUALITY CONSIDERATIONS--------------------------------------------------------------------
13-
# TODO: N4E is now a hard dependency, so the manifest swap only pins the N4E version and the two
14-
# manifests can be collapsed into one.
15-
# This job is deliberately not part of the PR checks: N4E 7.0.0 ships the unified API behind its own
16-
# experimental define, so nothing in the shipping configuration compiles it.
13+
# manifest-unified.json takes N4E from unity/unity trunk, so this job can break on N4E changes made outside NGO.
1714

1815
#------------------------------------------------------------------------------------
1916

@@ -37,7 +34,7 @@ unified_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3734
UNIFIED_TESTS: "true"
3835

3936
commands:
40-
# Swap in the manifest that pins the N4E version the unified API is written against.
37+
# Swap in the manifest that takes N4E from unity/unity trunk Workspace/com.unity.netcode.
4138
- cp {{ project.path }}/Packages/manifest-unified.json {{ project.path }}/Packages/manifest.json
4239
# Turn the unified API on. UNIFIED_NETCODE is opt-in, and N4E keeps its GameObject bridge internal
4340
# until NETCODE_GAMEOBJECT_BRIDGE_EXPERIMENTAL is defined, so both are needed here and nowhere else.

‎testproject/Packages/manifest-unified.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"com.unity.ide.visualstudio": "2.0.26",
99
"com.unity.mathematics": "1.4.0",
1010
"com.unity.multiplayer.tools": "2.2.11",
11-
"com.unity.netcode": "7.0.0",
11+
"com.unity.netcode": "https://github.cds.internal.unity3d.com/unity/unity.git?path=Workspace/com.unity.netcode#trunk",
1212
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
1313
"com.unity.package-validation-suite": "0.49.0-preview",
1414
"com.unity.services.authentication": "3.7.4",

0 commit comments

Comments
 (0)