Skip to content

Commit 7924b18

Browse files
NEW: add code coverage to CI jobs running Editor and Playmode tests on editor platforms (#2086)
Co-authored-by: Nikos Chagialas <[email protected]>
1 parent aec5efc commit 7924b18

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

.yamato/config.metadata

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,35 @@ upm_ci_install: npm install -g upm-ci-utils@stable --registry https://artifactor
1717
platforms_win:
1818
- name: win
1919
type: Unity::VM
20-
image: package-ci/win10:default
20+
image: package-ci/win10:v4
2121
flavor: b1.large
2222
- name: win_standalone
2323
type: Unity::VM
24-
image: package-ci/win10:default
24+
image: package-ci/win10:v4
2525
flavor: b1.large
2626
runtime: StandaloneWindows64
2727
- name: win_standalone_il2cpp
2828
type: Unity::VM
29-
image: package-ci/win10:default
29+
image: package-ci/win10:v4
3030
flavor: b1.large
3131
runtime: StandaloneWindows64
3232
scripting-backend: Il2Cpp
3333
installscript: unity-downloader-cli -c editor -c StandaloneSupport-IL2CPP --wait --fast -u
3434
platforms_nix:
3535
- name: mac
3636
type: Unity::VM::osx
37-
image: package-ci/macos-13:default
37+
image: package-ci/macos-13:v4
3838
flavor: m1.mac
3939
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
4040
- name: mac_standalone
4141
type: Unity::VM::osx
42-
image: package-ci/macos-13:default
42+
image: package-ci/macos-13:v4
4343
flavor: m1.mac
4444
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
4545
runtime: StandaloneOSX
4646
- name: mac_standalone_il2cpp
4747
type: Unity::VM::osx
48-
image: package-ci/macos-13:default
48+
image: package-ci/macos-13:v4
4949
flavor: m1.mac
5050
instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
5151
runtime: StandaloneOSX
@@ -84,4 +84,7 @@ instabilities_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifa
8484
instabilities_run_win: run_standalone_instability_detection-latest.bat 0.5.1 || exit 0
8585

8686
instabilities_install_nix: curl -s https://artifactory.prd.it.unity3d.com/artifactory/automation-and-tooling/infrastructure-instability-detection/standalone/setup/run_standalone_instability_detection-latest.sh --output run_standalone_instability_detection-latest.sh --retry 5 || exit 0
87-
instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
87+
instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0
88+
89+
yamato_source_dir_win: "%YAMATO_SOURCE_DIR%"
90+
yamato_source_dir_nix: ${YAMATO_SOURCE_DIR}

.yamato/upm-ci.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@
2323
- move /Y .\Assets\Samples.meta .\Packages\com.unity.inputsystem
2424
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
2525
# Run upm-ci verification tests as well as tests contained in the package.
26-
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
26+
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
27+
{% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem"
28+
--extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
2729
{% if platform.installscript %}
2830
- {{ unity_downloader_install }}
2931
- {{ platform.installscript }} {{ editor.version }}
@@ -33,7 +35,7 @@
3335
- move /Y .\Packages\com.unity.inputsystem\Samples .\Assets
3436
- move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
3537
# Now run our full test suite that sits in Assets/Tests by running UTR on our project.
36-
- ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem
38+
- ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "win" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem {% if platform.name == "win" %}--enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
3739
after:
3840
- {{ instabilities_install_win }}
3941
- {{ instabilities_run_win }}
@@ -64,7 +66,7 @@
6466
- mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
6567
- upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
6668
# Run upm-ci verification tests as well as tests contained in the package.
67-
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }}
69+
- upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }} {% if platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
6870
{% if platform.installscript %}
6971
- {{ unity_downloader_install }}
7072
- {{ platform.installscript }} {{ editor.version }}
@@ -74,7 +76,7 @@
7476
- mv ./Packages/com.unity.inputsystem/Samples ./Assets
7577
- mv ./Packages/com.unity.inputsystem/Samples.meta ./Assets
7678
# Now run our full test suite that sits in Assets/Tests by running UTR on our project.
77-
- ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "mac" %} --suite=editor {% endif %} {% if platform.name == "linux" %} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem
79+
- ./utr --testproject . --timeout=1200 --editor-location=.Editor --artifacts_path=upm-ci~/test-results/isolation-com.unity.inputsystem.tests --suite=playmode {% if platform.name == "mac" or platform.name == "linux"%} --suite=editor {% endif %} {% if category.name == "performance" %} --category=Performance {% endif %} --api-profile=NET_4_6 {% if platform.runtime %} --platform {{ platform.runtime }} {% endif %} {% if platform.scripting-backend %} --scripting-backend {{ platform.scripting-backend }} {% endif %} --report-performance-data --performance-project-id=InputSystem {% if platform.name == "mac" or platform.name == "linux" %} --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
7880
after:
7981
- {{ instabilities_install_nix }}
8082
- {{ platform.instabilities_run }}

0 commit comments

Comments
 (0)