remove the env var and just delete pre-merge reports

Author: stefanunity

.yamato/upm-ci.yml

@@ -12,10 +12,7 @@
     flavor: {{ platform.flavor }}
   variables:
     EDITOR_VERSION: {{ editor.version }}
-    KEEP_TEMP_CODE_COVERAGE_REPORTS: false
-  commands:    
-    {% assign keep_temp_coverage_reports = %KEEP_TEMP_CODE_COVERAGE_REPORTS% %}    
-    - echo {{ keep_temp_coverage_reports }}
+  commands:        
     - {{ utr_install_win }}
     - {{ upm_ci_install }}
     # Get version 2.3.0-preview of doctools package (it currently fails for 3.0.0-preview).
@@ -44,13 +41,9 @@
     # Merge all the code coverage results into one report.
     {% if platform.name == "win" %}
     - '{{ yamato_source_dir_win }}/.Editor/Unity.exe -projectPath {{ yamato_source_dir_win }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_win }}/Packages/com.unity.inputsystem/" -quit' 
-    #delete the reports from the two runs to only keep the final merged on
-    {% assign keep_temp_coverage_reports = KEEP_TEMP_CODE_COVERAGE_REPORTS %}    
-    {% if keep_temp_coverage_reports != true %}          
-    - echo "inside the if"
+    #delete the reports from the two runs and only keep the final merged one
     - rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package"
-    - rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project"
-    {% endif %}      
+    - rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project"   
     {% endif %}
   after:
     - {{ instabilities_install_win }}
@@ -84,7 +77,7 @@
     - mv ./Assets/Samples.meta ./Packages/com.unity.inputsystem
     - upm-ci package pack --package-path ./Packages/com.unity.inputsystem/
     # Run upm-ci verification tests as well as tests contained in the package.
-    - 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 %}
+    - 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;pathReplacePatterns:@*,,Library/PackageCache,Packages" " --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
     {% if platform.installscript %}
     - {{ unity_downloader_install }}
     - {{ platform.installscript }} $EDITOR_VERSION