From a7af059d355998d5a90ce5764f925c328cc2dbf4 Mon Sep 17 00:00:00 2001 From: kazuki Date: Mon, 26 Sep 2022 15:06:35 +0900 Subject: [PATCH 1/4] add job to generate code coverage report --- .yamato/upm-ci-renderstreaming-packages.yml | 33 +++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/.yamato/upm-ci-renderstreaming-packages.yml b/.yamato/upm-ci-renderstreaming-packages.yml index fa92ec8a4..0b8566ed5 100644 --- a/.yamato/upm-ci-renderstreaming-packages.yml +++ b/.yamato/upm-ci-renderstreaming-packages.yml @@ -411,3 +411,36 @@ publish_{{ package.name }}: {% endif %} {% endfor %} {% endfor %} + +{% for platform in platforms %} +{% if platform.name != "macos" and platform.name != "macos-m1" %} +{% for editor in editors %} +codecoverage_{{ package.name }}_{{ platform.name }}_{{ editor.version }}: + name: Codecoverage {{ package.packagename }} {{ platform.name }} {{ editor.version }} + agent: + type: {{ platform.type }} + image: {{ platform.image }} + flavor: {{ platform.flavor }} + commands: + - pip config set global.index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple + - pip install unity-downloader-cli --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple + - npm install upm-ci-utils@{{ upm.package_version }} -g --registry {{ upm.registry_url }} +{% if platform.name == "win" %} + - | + set WEBAPP_PATH=%cd%\Webapp\bin~\{{ platform.packed_webapp_name }} + upm-ci package test -u {{ editor.version }} --package-path {{ package.packagename }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;generateBadgeReport;assemblyFilters:-UnityEngine.*,+Unity.RenderStreaming" --extra-utr-arg="--timeout=3000" +{% else %} + - | + export WEBAPP_PATH=$(pwd)/WebApp/bin~/{{ platform.packed_webapp_name }} + upm-ci package test -u {{ editor.version }} --package-path {{ package.packagename }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;generateBadgeReport;assemblyFilters:-UnityEngine.*,+Unity.RenderStreaming" --extra-utr-arg="--timeout=3000" +{% endif %} + artifacts: + {{ package.name }}_{{ editor.version }}_{{ platform.name }}_coverage_results: + paths: + - "upm-ci~/test-results/**" + dependencies: + - .yamato/upm-ci-renderstreaming-packages.yml#pack_{{ package.name }} + - .yamato/upm-ci-webapp.yml#pack_{{ platform.packed_webapp_platform }} +{% endfor %} +{% endif %} +{% endfor %} From cb842d45be602ce3360e4654b55fbe01a6d96959 Mon Sep 17 00:00:00 2001 From: kazuki Date: Mon, 26 Sep 2022 15:09:09 +0900 Subject: [PATCH 2/4] fix --- .yamato/upm-ci-renderstreaming-packages.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/upm-ci-renderstreaming-packages.yml b/.yamato/upm-ci-renderstreaming-packages.yml index 0b8566ed5..d5f20844a 100644 --- a/.yamato/upm-ci-renderstreaming-packages.yml +++ b/.yamato/upm-ci-renderstreaming-packages.yml @@ -415,8 +415,8 @@ publish_{{ package.name }}: {% for platform in platforms %} {% if platform.name != "macos" and platform.name != "macos-m1" %} {% for editor in editors %} -codecoverage_{{ package.name }}_{{ platform.name }}_{{ editor.version }}: - name: Codecoverage {{ package.packagename }} {{ platform.name }} {{ editor.version }} +codecoverage_{{ package.packagename }}_{{ platform.name }}_{{ editor.version }}: + name: Code coverage {{ package.packagename }} {{ platform.name }} {{ editor.version }} agent: type: {{ platform.type }} image: {{ platform.image }} From 0a3169246c3816eb7024f65a7e8890221a46baa7 Mon Sep 17 00:00:00 2001 From: kazuki Date: Mon, 26 Sep 2022 15:11:53 +0900 Subject: [PATCH 3/4] fix --- .yamato/upm-ci-renderstreaming-packages.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.yamato/upm-ci-renderstreaming-packages.yml b/.yamato/upm-ci-renderstreaming-packages.yml index d5f20844a..f7406f37b 100644 --- a/.yamato/upm-ci-renderstreaming-packages.yml +++ b/.yamato/upm-ci-renderstreaming-packages.yml @@ -410,7 +410,6 @@ publish_{{ package.name }}: - .yamato/upm-ci-renderstreaming-packages.yml#trigger_test_{{ package.name }}_{{ editor.version }} {% endif %} {% endfor %} -{% endfor %} {% for platform in platforms %} {% if platform.name != "macos" and platform.name != "macos-m1" %} @@ -444,3 +443,5 @@ codecoverage_{{ package.packagename }}_{{ platform.name }}_{{ editor.version }}: {% endfor %} {% endif %} {% endfor %} + +{% endfor %} From 65de5990165da5a5e2b119c28ca69ba20a666246 Mon Sep 17 00:00:00 2001 From: kazuki Date: Tue, 27 Sep 2022 10:20:47 +0900 Subject: [PATCH 4/4] change assembly name --- .../Runtime/Unity.RenderStreaming.Runtime.asmdef | 2 +- .../Samples~/Example/Unity.RenderStreaming.Samples.asmdef | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/com.unity.renderstreaming/Runtime/Unity.RenderStreaming.Runtime.asmdef b/com.unity.renderstreaming/Runtime/Unity.RenderStreaming.Runtime.asmdef index f407ecf44..68ad48530 100644 --- a/com.unity.renderstreaming/Runtime/Unity.RenderStreaming.Runtime.asmdef +++ b/com.unity.renderstreaming/Runtime/Unity.RenderStreaming.Runtime.asmdef @@ -1,5 +1,5 @@ { - "name": "Unity.RenderStreaming.Runtime", + "name": "Unity.RenderStreaming", "rootNamespace": "", "references": [ "Unity.InputSystem", diff --git a/com.unity.renderstreaming/Samples~/Example/Unity.RenderStreaming.Samples.asmdef b/com.unity.renderstreaming/Samples~/Example/Unity.RenderStreaming.Samples.asmdef index c3fde343d..7aeb59930 100644 --- a/com.unity.renderstreaming/Samples~/Example/Unity.RenderStreaming.Samples.asmdef +++ b/com.unity.renderstreaming/Samples~/Example/Unity.RenderStreaming.Samples.asmdef @@ -5,7 +5,7 @@ "Unity.InputSystem", "Unity.XR.ARFoundation", "Unity.XR.ARSubsystems", - "Unity.RenderStreaming.Runtime", + "Unity.RenderStreaming", "Unity.RenderStreaming.Sample.Stats" ], "includePlatforms": [],