Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .yamato/_triggers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ pr_code_changes_checks:
- .yamato/cmb-service-standalone-tests.yml#cmb_service_standalone_test_testproject_ubuntu_il2cpp_{{ validation_editors.default }}
# Run code coverage test
- .yamato/code-coverage.yml#code_coverage_project_test_testproject_ubuntu_{{ validation_editors.default }}
# Run unified tests against N4E from unity/unity trunk
- .yamato/unified-tests.yml#unified_test_testproject_ubuntu_{{ validation_editors.default }}
triggers:
expression: |-
(pull_request.comment eq "ngo" OR
Expand Down
7 changes: 2 additions & 5 deletions .yamato/unified-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@
# 2. For all unified editors (currently a single pinned alpha, see project.metafile)

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

#------------------------------------------------------------------------------------

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

commands:
# Swap in the manifest that pins the N4E version the unified API is written against.
# Swap in the manifest that takes N4E from unity/unity trunk Workspace/com.unity.netcode.
- cp {{ project.path }}/Packages/manifest-unified.json {{ project.path }}/Packages/manifest.json
# Turn the unified API on. UNIFIED_NETCODE is opt-in, and N4E keeps its GameObject bridge internal
# until NETCODE_GAMEOBJECT_BRIDGE_EXPERIMENTAL is defined, so both are needed here and nowhere else.
Expand Down
2 changes: 1 addition & 1 deletion testproject/Packages/manifest-unified.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"com.unity.ide.visualstudio": "2.0.26",
"com.unity.mathematics": "1.4.0",
"com.unity.multiplayer.tools": "2.2.11",
"com.unity.netcode": "7.0.0",
"com.unity.netcode": "https://github.cds.internal.unity3d.com/unity/unity.git?path=Workspace/com.unity.netcode#trunk",
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
"com.unity.package-validation-suite": "0.49.0-preview",
"com.unity.services.authentication": "3.7.4",
Expand Down
Loading