Skip to content

Commit f45fe9c

Browse files
committed
Corrected unified manifest and coreclr testing
1 parent 7c9716c commit f45fe9c

3 files changed

Lines changed: 11 additions & 10 deletions

File tree

.yamato/cmb-service-standalone-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# 1. For all desktop platform (Windows, macOS, Ubuntu)
1414
# 2. For all supported Unity Editor versions (for NGOv2.X this means 6000.0+ editors)
1515
# 3. For the default project.
16-
# 4. For all scripting backends (mono, il2cpp)
16+
# 4. For all scripting backends (mono, il2cpp, coreclr)
1717

1818
# TECHNICAL CONSIDERATIONS---------------------------------------------------------------
1919
# For desktop devices a split is into two phases is not required but we use it for consistency with setup of others standalone platforms:
@@ -56,7 +56,7 @@ cmb_service_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}
5656
# run_cmb_service.sh builds and starts a release version of the full CMB service (along with the limited echo server)
5757
- ./Tools/CI/service.cmb/run_cmb_service.sh -e $ECHO_SERVER_PORT -s $CMB_SERVICE_PORT -l artifacts
5858

59-
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
59+
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% elif backend == "coreclr" %} -c coreclr {% endif %} {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
6060
- UnifiedTestRunner --suite=playmode --player-load-path=build/players --artifacts-path=test-results --testproject={{ project.path }} --editor-location=.Editor --playergraphicsapi=Null --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }}
6161
artifacts:
6262
logs:

.yamato/desktop-standalone-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# 1. For all desktop platform (Windows, macOS, Ubuntu)
1111
# 2. For all supported Unity Editor versions (for NGOv2.X this means 6000.0+ editors)
1212
# 3. For the default project.
13-
# 4. For all scripting backends (mono, il2cpp)
13+
# 4. For all scripting backends (mono, il2cpp, coreclr)
1414

1515
# TECHNICAL CONSIDERATIONS---------------------------------------------------------------
1616
# For desktop devices a split is into two phases is not required but we use it for consistency with setup of others standalone platforms:
@@ -43,7 +43,7 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
4343
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
4444
{% endif %}
4545
commands:
46-
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %}
46+
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% elif backend == "coreclr" %} -c coreclr {% endif %}
4747
- UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --testproject={{ project.path }} --scripting-backend={{ backend }} --testfilter="Unity.Netcode.RuntimeTests.*" --player-save-path=build/players --artifacts-path=artifacts --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout={{ test_timeout }}
4848
artifacts:
4949
players:
@@ -79,7 +79,7 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
7979
{% endif %}
8080

8181
commands:
82-
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
82+
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% elif backend == "coreclr" %} -c coreclr {% endif %} {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
8383
- UnifiedTestRunner --suite=playmode --player-load-path=build/players --artifacts-path=test-results --testproject={{ project.path }} --editor-location=.Editor --playergraphicsapi=Null --fail-on-assert --rerun-strategy=Test --retry={{ num_test_retries }} --clean-library-on-rerun --timeout={{ test_timeout }}
8484
artifacts:
8585
logs:

testproject/Packages/manifest-unified.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"com.unity.ide.rider": "3.0.40",
88
"com.unity.ide.visualstudio": "2.0.26",
99
"com.unity.mathematics": "1.4.0",
10-
"com.unity.multiplayer.tools": "2.2.10",
10+
"com.unity.multiplayer.tools": "2.2.11",
1111
"com.unity.netcode": "6.7.0",
1212
"com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects",
1313
"com.unity.package-validation-suite": "0.49.0-preview",
14-
"com.unity.services.authentication": "3.7.3",
15-
"com.unity.services.multiplayer": "2.3.0",
16-
"com.unity.test-framework": "1.8.0",
17-
"com.unity.test-framework.performance": "6.6.0",
14+
"com.unity.services.authentication": "3.7.4",
15+
"com.unity.services.multiplayer": "2.3.1",
16+
"com.unity.test-framework": "1.9.0",
17+
"com.unity.test-framework.performance": "6.7.0",
1818
"com.unity.timeline": "6.7.0",
1919
"com.unity.ugui": "2.7.0",
2020
"com.unity.modules.accessibility": "1.0.0",
@@ -29,6 +29,7 @@
2929
"com.unity.modules.imageconversion": "1.0.0",
3030
"com.unity.modules.imgui": "1.0.0",
3131
"com.unity.modules.jsonserialize": "1.0.0",
32+
"com.unity.modules.localizationruntime": "1.0.0",
3233
"com.unity.modules.particlesystem": "1.0.0",
3334
"com.unity.modules.physics": "1.0.0",
3435
"com.unity.modules.physics2d": "1.0.0",

0 commit comments

Comments
 (0)