Skip to content

Commit 5aaaf9d

Browse files
committed
Added --wait flag when downloading editor
1 parent 65715c3 commit 5aaaf9d

9 files changed

+12
-12
lines changed

.yamato/code-coverage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ code_coverage_{{ platform.name }}_{{ editor }}:
3434
image: {{ platform.image }}
3535
flavor: {{ platform.flavor }}
3636
commands:
37-
- unity-downloader-cli -u {{ editor }} -c Editor
37+
- unity-downloader-cli -u {{ editor }} -c Editor --wait
3838
- upm-pvp create-test-project test-project --packages "upm-ci~/packages/*.tgz" --unity .Editor
3939
- 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
4040
artifacts:

.yamato/console-standalone-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ console_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
4747
image: {{ platform.image }}
4848
flavor: {{ platform.flavor }}
4949
commands:
50-
- unity-downloader-cli -u {{ editor }} -c Editor -c il2cpp -c {{ platform.name }}
50+
- unity-downloader-cli -u {{ editor }} -c Editor -c il2cpp -c {{ platform.name }} --wait
5151
- UnifiedTestRunner --testproject={{ project.path }} --architecture={% if platform.name == "switch" %}arm64{% else %}x64{% endif %} --scripting-backend=il2cpp --suite=playmode --platform={{ platform.standalone }} --editor-location=.Editor --artifacts-path=artifacts --player-save-path=build/players --testfilter="Unity.Netcode.RuntimeTests.*" --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout=1800
5252
variables:
5353
# PS4 related
@@ -86,7 +86,7 @@ console_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
8686
model: {{ platform.model }}
8787
{% endif %}
8888
commands:
89-
- unity-downloader-cli -u {{ editor }} -c Editor -c il2cpp -c {{ platform.name }}
89+
- unity-downloader-cli -u {{ editor }} -c Editor -c il2cpp -c {{ platform.name }} --wait
9090
- UnifiedTestRunner --suite=playmode --testproject={{ project.path }} --editor-location=.Editor --artifacts-path=test-results --player-load-path=build/players --fail-on-assert --reruncount=1 --clean-library-on-rerun --timeout=1800
9191
variables:
9292
# PS4 related

.yamato/desktop-standalone-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ desktop_standalone_build_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
4040
image: {{ platform.image }}
4141
flavor: {{ platform.flavor }}
4242
commands:
43-
- unity-downloader-cli -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %}
43+
- unity-downloader-cli -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} --wait
4444
- 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
4545
artifacts:
4646
players:
@@ -81,7 +81,7 @@ desktop_standalone_test_{{ project.name }}_{{ platform.name }}_{{ backend }}_{{
8181
{% endif %}
8282

8383
commands:
84-
- unity-downloader-cli -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %}
84+
- unity-downloader-cli -u {{ editor }} -c Editor {% if backend == "il2cpp" %} -c il2cpp {% endif %} --wait
8585
- UnifiedTestRunner --suite=playmode --player-load-path=build/players --artifacts-path=test-results --testproject={{ project.path }} --editor-location=.Editor --playergraphicsapi=Null --fail-on-assert --reruncount=1 --clean-library-on-rerun --timeout=1800
8686

8787
# If ubuntu, run rust echo server

.yamato/mobile-standalone-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ mobile_standalone_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
4646
image: {{ platform.image }}
4747
flavor: {{ platform.flavor }}
4848
commands:
49-
- unity-downloader-cli -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %}
49+
- unity-downloader-cli -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %} --wait
5050
- UnifiedTestRunner --suite=playmode --platform={{ platform.standalone }} --testproject={{ project.path }} --architecture={{ platform.architecture }} --scripting-backend=il2cpp --editor-location=.Editor --artifacts-path=artifacts --testfilter="Unity.Netcode.RuntimeTests.*" --player-save-path=build/players --extra-editor-arg=-batchmode --extra-editor-arg=-nographics --reruncount=1 --clean-library-on-rerun --build-only --timeout=1800
5151
artifacts:
5252
players:
@@ -75,7 +75,7 @@ mobile_standalone_test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
7575
{% endif %}
7676
commands:
7777
# Installing editor. We still need the editor to run tests on standalone build and for that the Editor is required
78-
- unity-downloader-cli -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %}
78+
- unity-downloader-cli -u {{ editor }} -c Editor -c il2cpp {% if platform.base == "mac" %} -c ios {% else %} -c android {% endif %} --wait
7979

8080
{% if platform.standalone == "Android" %}
8181
# Download standalone UnityTestRunner and ADB setup

.yamato/package-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}:
3636
XRAY_PROFILE: "supported ./pvpExceptions.json"
3737
UNITY_EXT_LOGGING: 1
3838
commands:
39-
- unity-downloader-cli -u {{ editor }} -c Editor --fast --wait
39+
- unity-downloader-cli -u {{ editor }} -c Editor --wait
4040

4141
# Validate PVP checks for package.
4242
- 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
@@ -32,7 +32,7 @@ performance_editor_tests_-_NGO_{{ platform.name }}_{{ editor }}_no_data_reportin
3232
image: {{ platform.image }}
3333
flavor: {{ platform.flavor }}
3434
commands:
35-
- unity-downloader-cli -u {{ editor }} -c Editor # Installing basic editor
35+
- unity-downloader-cli -u {{ editor }} -c Editor --wait # Installing basic editor
3636
- 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
3737
# TODO: when performance tests will be present we need to add actual execution of this test
3838
artifacts:

.yamato/project-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ standards_{{ platform.name }}_{{ project.name }}_{{ editor }}:
4141
- dotnet --version
4242
- dotnet format --version
4343

44-
- unity-downloader-cli -u {{ editor }} -c editor # Downloads basic editor
44+
- unity-downloader-cli -u {{ editor }} -c editor --wait # Downloads basic editor
4545
- .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
4646
- dotnet run --project=dotnet-tools/netcode.standards -- --project={{ project.path }} --check # Runs standards check
4747
{% endfor -%}

.yamato/project-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ test_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3636
flavor: {{ platform.flavor }}
3737
commands:
3838
- 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
39-
- unity-downloader-cli -u {{ editor }} -c Editor # Installing basic editor for tests execution
39+
- unity-downloader-cli -u {{ editor }} -c Editor --wait # Installing basic editor for tests execution
4040
- 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
4141
artifacts:
4242
logs:

.yamato/webgl-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ webgl_build_{{ project.name }}_{{ platform.name }}_{{ editor }}:
3333
image: {{ platform.image }}
3434
flavor: {{ platform.flavor }}
3535
commands:
36-
- unity-downloader-cli -u {{ editor }} -c Editor -c webgl -c il2cpp # Downloading the editor with additional webgl and il2cpp components
36+
- unity-downloader-cli -u {{ editor }} -c Editor -c webgl -c il2cpp --wait # Downloading the editor with additional webgl and il2cpp components
3737

3838
# The following step builds the player with defined options such as:
3939
# 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)