Skip to content

Commit 3c7d356

Browse files
committed
Added arm64 component to editors where necessary
1 parent 001934e commit 3c7d356

File tree

7 files changed

+7
-7
lines changed

7 files changed

+7
-7
lines changed

.yamato/code-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ code_coverage_{{ platform.name }}_{{ editor }}:
3838
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
3939
{% endif %}
4040
commands:
41-
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor
41+
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
4242
- upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --unity .Editor
4343
- UnifiedTestRunner --suite=editor --suite=playmode --editor-location=.Editor --testproject=test-project --enable-code-coverage -coverage-results-path=$PWD/test-results/CodeCoverage --coverage-options="generateHtmlReport;generateAdditionalMetrics;assemblyFilters:+Unity.Netcode.Editor,+Unity.Netcode.Runtime" --extra-editor-arg=--burst-disable-compilation --timeout=1800 --reruncount=1 --clean-library-on-rerun --artifacts-path=test-results
4444
artifacts:

.yamato/desktop-standalone-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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 {% endif %} {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
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=1800
4848
artifacts:
4949
players:

.yamato/package-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}:
3939
XRAY_PROFILE: "supported ./pvpExceptions.json"
4040
UNITY_EXT_LOGGING: 1
4141
commands:
42-
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor
42+
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models
4343

4444
# Validate PVP checks for package.
4545
- upm-pvp test --unity .Editor --packages "upm-ci~/packages/*.tgz" --filter "com.unity.netcode.gameobjects" --results pvp-results

.yamato/performance-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ performance_editor_tests_-_NGO_{{ platform.name }}_{{ editor }}_no_data_reportin
3535
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
3636
{% endif %}
3737
commands:
38-
- unity-downloader-cli -u {{ editor }} -c Editor --wait # Installing basic editor
38+
- unity-downloader-cli -u {{ editor }} -c Editor --wait {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Installing basic editor
3939
- UnifiedTestRunner --suite=editor --suite=playmode --testproject={{ project.path }} --editor-location=.Editor --timeout=3600 --artifacts-path=artifacts --extra-editor-arg=-assemblyNames --extra-editor-arg=Unity.NetCode.* --extra-editor-arg=-testCategory --extra-editor-arg=Performance --extra-editor-arg=-enablePackageManagerTraces --reruncount=1 --clean-library-on-rerun --dontreportperformancedata
4040
# TODO: when performance tests will be present we need to add actuall execution of this test
4141
artifacts:

.yamato/project-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
4545
- dotnet --version
4646
- dotnet format --version
4747

48-
- unity-downloader-cli --fast --wait -u {{ editor }} -c editor # Downloads basic editor
48+
- 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
4949
- .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
5050
- dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --check # Runs standards check
5151
{% endfor -%}

.yamato/project-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3939
{% endif %}
4040
commands:
4141
- npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm # upm-ci is not preinstalled on the image so we need to download it
42-
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor # Installing basic editor for tests execution
42+
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Installing basic editor for tests execution
4343
- upm-ci project test -u {{ editor }} --project-path {{ project.path }} --type project-tests --extra-utr-arg="--reruncount=1 --clean-library-on-rerun" # project tests execution via upm-ci
4444
artifacts:
4545
logs:

.yamato/webgl-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3636
model: {{ platform.model }} # This is set only in platforms where we want non-default model to use (more information in project.metafile)
3737
{% endif %}
3838
commands:
39-
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c webgl -c il2cpp # Downloading the editor with additional webgl and il2cpp components
39+
- unity-downloader-cli --fast --wait -u {{ editor }} -c Editor -c webgl -c il2cpp {% if platform.name == "mac" %} --arch arm64 {% endif %} # For macOS we use ARM64 models. Downloading the editor with additional webgl and il2cpp components
4040

4141
# The following step builds the player with defined options such as:
4242
# Suite parameter if defined since it's a mandatory field to define which test suite should be used, but it doesn't matter in this case since we won't run any tests (--suite)

0 commit comments

Comments
 (0)