From 36ee7cfa985c709df84a8b92936dc848d50a6aca Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 3 Jan 2025 15:26:30 +0100
Subject: [PATCH 01/36] check if variable gets passed to report generator

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index ad36998e5f..8cff0db5af 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -37,7 +37,7 @@
     - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets
     - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
-    - ./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 %}
+    - ./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;reports:%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package/iNpImD-opencov/*/*.xml" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
   after:
     - {{ instabilities_install_win }}
     - {{ instabilities_run_win }}  

From 84f5547bf4fdf5b436655417478d0ca52b52cee3 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Tue, 7 Jan 2025 11:08:11 +0100
Subject: [PATCH 02/36] Revert "check if variable gets passed to report
 generator"

This reverts commit 36ee7cfa985c709df84a8b92936dc848d50a6aca.
---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 8cff0db5af..ad36998e5f 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -37,7 +37,7 @@
     - move /Y .\Packages\com.unity.inputsystem\Samples .\Assets
     - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
-    - ./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;reports:%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package/iNpImD-opencov/*/*.xml" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %}
+    - ./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 %}
   after:
     - {{ instabilities_install_win }}
     - {{ instabilities_run_win }}  

From debf970a6ec5cc921a28c99746ae7ad9e9b42169 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Tue, 7 Jan 2025 13:09:35 +0100
Subject: [PATCH 03/36] new try how the manual says

---
 .yamato/upm-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index ad36998e5f..c5de8213e3 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -38,6 +38,7 @@
     - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
     - ./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 %}
+    - {% 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 {% endif %}
   after:
     - {{ instabilities_install_win }}
     - {{ instabilities_run_win }}  

From beaab4bf425c570d76bac085480a91f8104d40e6 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Tue, 7 Jan 2025 13:13:08 +0100
Subject: [PATCH 04/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index c5de8213e3..967ee175a4 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -38,7 +38,7 @@
     - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
     - ./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 %}
-    - {% 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 {% endif %}
+    {% 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 {% endif %}
   after:
     - {{ instabilities_install_win }}
     - {{ instabilities_run_win }}  

From b97bd27d3f13aa243cc69b912049d1b31fe55fde Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Tue, 7 Jan 2025 16:12:04 +0100
Subject: [PATCH 05/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 967ee175a4..2eb2411f44 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -38,7 +38,8 @@
     - move /Y .\Packages\com.unity.inputsystem\Samples.meta .\Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
     - ./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 %}
-    {% 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 {% endif %}
+    # 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 {% else %} echo Do Nothing {% endif %}
   after:
     - {{ instabilities_install_win }}
     - {{ instabilities_run_win }}  

From 6dd62157189ef2b87886143cbc3009bc71dd7fda Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Tue, 7 Jan 2025 16:26:10 +0100
Subject: [PATCH 06/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 2eb2411f44..8759eae9a3 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -39,7 +39,7 @@
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
     - ./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 %}
     # 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 {% else %} echo Do Nothing {% endif %}
+    - {% if platform.name == "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 {% else %} echo Do Nothing {% endif %}
   after:
     - {{ instabilities_install_win }}
     - {{ instabilities_run_win }}  

From 2d8f7592528fe63cfbff6a1c25c392e59e38b459 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Tue, 7 Jan 2025 18:31:01 +0100
Subject: [PATCH 07/36] nicer if clause

---
 .yamato/upm-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 8759eae9a3..bcbcd6e600 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -39,7 +39,9 @@
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
     - ./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 %}
     # Merge all the code coverage results into one report.
-    - {% if platform.name == "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 {% else %} echo Do Nothing {% endif %}
+    {% 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 
+    {% endif %}
   after:
     - {{ instabilities_install_win }}
     - {{ instabilities_run_win }}  

From 4b604d780d5d5db35af0fac4326172fed7d77647 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Tue, 7 Jan 2025 19:10:11 +0100
Subject: [PATCH 08/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index bcbcd6e600..b16c955988 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -40,7 +40,7 @@
     - ./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 %}
     # 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 
+    - {{ 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 
     {% endif %}
   after:
     - {{ instabilities_install_win }}

From 56e8ecbd7018d7d8af23423024a39993168ad1b4 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Tue, 7 Jan 2025 19:18:07 +0100
Subject: [PATCH 09/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index b16c955988..87a1227b38 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -40,7 +40,7 @@
     - ./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 %}
     # 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 
+    - '{{ 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' 
     {% endif %}
   after:
     - {{ instabilities_install_win }}

From e2abfee23b299c8d27a34da3117322af4b2a9dca Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Wed, 8 Jan 2025 16:32:07 +0100
Subject: [PATCH 10/36] add merging to mac and linux editor job

---
 .yamato/upm-ci.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 87a1227b38..8d84e96b21 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -85,6 +85,13 @@
     - mv ./Packages/com.unity.inputsystem/Samples.meta ./Assets
     # Now run our full test suite that sits in Assets/Tests by running UTR on our project.
     - ./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 %}
+    # Merge all the code coverage results into one report.
+    {% if platform.name == "mac" %}
+    - '{{ yamato_source_dir_nix }}/.Editor/Unity.app/Contents/MacOS/Unity -projectPath {{ yamato_source_dir_nix }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_nix }}/Packages/com.unity.inputsystem/" -quit' 
+    {% endif %}
+    {% if platform.name == "linux" %}
+    - '{{ yamato_source_dir_nix }}/.Editor/Unity -projectPath {{ yamato_source_dir_nix }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_nix }}/Packages/com.unity.inputsystem/" -quit' 
+    {% endif %}
   after:
     - {{ instabilities_install_nix }}
     - {{ platform.instabilities_run }}

From a2da19c0d39ba297a3cb510538c447fa6bd69ea9 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Wed, 8 Jan 2025 17:58:06 +0100
Subject: [PATCH 11/36] add pathfilter to package test run

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 8d84e96b21..30130942b2 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -26,7 +26,7 @@
     - 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 == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" 
+      {% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathFilters:+{{ yamato_source_dir_win }}/Packages/com.unity.inputsystem" 
       --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
     {% if platform.installscript %}
     - {{ unity_downloader_install }}

From 022280ce0cec519366f0e6aee253ef20d99dbcd9 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Wed, 8 Jan 2025 19:49:26 +0100
Subject: [PATCH 12/36] try sourcePaths option

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 30130942b2..d57ab2e6f4 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -26,7 +26,7 @@
     - 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 == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathFilters:+{{ yamato_source_dir_win }}/Packages/com.unity.inputsystem" 
+      {% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_win }}/Packages/com.unity.inputsystem" 
       --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
     {% if platform.installscript %}
     - {{ unity_downloader_install }}

From f25281362c8d0b4fd6a0cf4be7a9aa6b8f9da735 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 9 Jan 2025 10:31:21 +0100
Subject: [PATCH 13/36] try pathReplacePatterns to fix reporting

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index d57ab2e6f4..b9185bdec5 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -26,7 +26,7 @@
     - 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 == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_win }}/Packages/com.unity.inputsystem" 
+      {% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:Library/PackageCache,Packages" 
       --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
     {% if platform.installscript %}
     - {{ unity_downloader_install }}

From ad6cd3a9eb124d76ae4830f3aae17502a7ef0759 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 9 Jan 2025 15:47:54 +0100
Subject: [PATCH 14/36] delete pre-merge reports to no clutter artifacts with
 it

---
 .yamato/upm-ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index b9185bdec5..dec8e5ae92 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -12,6 +12,7 @@
     flavor: {{ platform.flavor }}
   variables:
     EDITOR_VERSION: {{ editor.version }}
+    KEEP_TEMP_CODE_COVERAGE_REPORTS: false
   commands:
     - {{ utr_install_win }}
     - {{ upm_ci_install }}
@@ -41,6 +42,11 @@
     # 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
+    {% if %KEEP_TEMP_CODE_COVERAGE_REPORTS% == false %}  
+    - rmdir /s "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package"
+    - rmdir /s "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project"
+    {% endif %}      
     {% endif %}
   after:
     - {{ instabilities_install_win }}

From 540e8f9ffa07ac2457b0ab44d148149bba306fe5 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 9 Jan 2025 16:45:26 +0100
Subject: [PATCH 15/36] fix variable use

---
 .yamato/upm-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index dec8e5ae92..2dbbfd4ea5 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -43,9 +43,9 @@
     {% 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
-    {% if %KEEP_TEMP_CODE_COVERAGE_REPORTS% == false %}  
-    - rmdir /s "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package"
-    - rmdir /s "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project"
+    {% if KEEP_TEMP_CODE_COVERAGE_REPORTS == false %}  
+    - 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 %}      
     {% endif %}
   after:

From 959b25c436f28362f34d574e9313716dcddfd339 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 9 Jan 2025 20:34:35 +0100
Subject: [PATCH 16/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 2dbbfd4ea5..dc3717e7e7 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -43,10 +43,8 @@
     {% 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
-    {% if KEEP_TEMP_CODE_COVERAGE_REPORTS == false %}  
     - 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 }}

From 6058fafb21b9cffd94db99a5fa3cb3934d7fc969 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Thu, 9 Jan 2025 21:55:31 +0100
Subject: [PATCH 17/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index dc3717e7e7..a9c1174f15 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -43,8 +43,11 @@
     {% 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
+    {% if KEEP_TEMP_CODE_COVERAGE_REPORTS == false %}  
+    - echo "inside the if"
     - 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"    
+    - rmdir /s/q "{{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project"
+    {% endif %}      
     {% endif %}
   after:
     - {{ instabilities_install_win }}

From b2bb38ce9c9f50597b0e44475098c3fa7474800d Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 10:51:34 +0100
Subject: [PATCH 18/36] more pathreplacing for upm ci oddities

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index a9c1174f15..f7f9998220 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -27,7 +27,7 @@
     - 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 == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:Library/PackageCache,Packages" 
+      {% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:Library/PackageCache,Packages,Library/PackageCache/com.unity.inputsystem@*,Library/PackageCache/com.unity.inputsystem" 
       --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
     {% if platform.installscript %}
     - {{ unity_downloader_install }}

From 67348cc2f93d1d47991f3564046dacc8aede81f2 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 11:39:53 +0100
Subject: [PATCH 19/36] shorter version to fix path replacing with "@"

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index f7f9998220..11131dcf26 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -27,7 +27,7 @@
     - 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 == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:Library/PackageCache,Packages,Library/PackageCache/com.unity.inputsystem@*,Library/PackageCache/com.unity.inputsystem" 
+      {% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;pathReplacePatterns:@*,,Library/PackageCache,Packages" 
       --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% endif %}
     {% if platform.installscript %}
     - {{ unity_downloader_install }}

From 2660099ed537cb3fa0a12a1c0f7ee76b89d02c20 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 12:47:07 +0100
Subject: [PATCH 20/36] remove env var from control flow

---
 .yamato/upm-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 11131dcf26..8497a0bad9 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -43,7 +43,8 @@
     {% 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
-    {% if KEEP_TEMP_CODE_COVERAGE_REPORTS == false %}  
+    {% assign keep_temp = KEEP_TEMP_CODE_COVERAGE_REPORTS %}
+    {% if keep_temp == false %}  
     - echo "inside the if"
     - 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"

From 80939332bca79c9419898a8bc5a3e476146052ba Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 13:24:37 +0100
Subject: [PATCH 21/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 8497a0bad9..56593c73d8 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -14,6 +14,7 @@
     EDITOR_VERSION: {{ editor.version }}
     KEEP_TEMP_CODE_COVERAGE_REPORTS: false
   commands:
+    - echo %KEEP_TEMP_CODE_COVERAGE_REPORTS%
     - {{ utr_install_win }}
     - {{ upm_ci_install }}
     # Get version 2.3.0-preview of doctools package (it currently fails for 3.0.0-preview).
@@ -42,7 +43,7 @@
     # 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
+    #delete the reports from the two runs to only keep the final merged on    
     {% assign keep_temp = KEEP_TEMP_CODE_COVERAGE_REPORTS %}
     {% if keep_temp == false %}  
     - echo "inside the if"

From 673ab55c668e5a072055337d5f7f7623b8999ca0 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 13:54:46 +0100
Subject: [PATCH 22/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 56593c73d8..2764367c9e 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -15,6 +15,11 @@
     KEEP_TEMP_CODE_COVERAGE_REPORTS: false
   commands:
     - echo %KEEP_TEMP_CODE_COVERAGE_REPORTS%
+    {% assign keep_temp = %KEEP_TEMP_CODE_COVERAGE_REPORTS% %}
+    - echo {{ keep_temp }}
+    {% if keep_temp == false %}  
+    - echo "test"
+    {% endif %}
     - {{ utr_install_win }}
     - {{ upm_ci_install }}
     # Get version 2.3.0-preview of doctools package (it currently fails for 3.0.0-preview).

From b6cb422fefc4ccf50eb5030a95d813b1c1038b5e Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 13:58:40 +0100
Subject: [PATCH 23/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 2764367c9e..f8ffed2730 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -15,9 +15,8 @@
     KEEP_TEMP_CODE_COVERAGE_REPORTS: false
   commands:
     - echo %KEEP_TEMP_CODE_COVERAGE_REPORTS%
-    {% assign keep_temp = %KEEP_TEMP_CODE_COVERAGE_REPORTS% %}
-    - echo {{ keep_temp }}
-    {% if keep_temp == false %}  
+    {% assign keep_temp = %KEEP_TEMP_CODE_COVERAGE_REPORTS% %}    
+    {% if keep_temp == "false" %}  
     - echo "test"
     {% endif %}
     - {{ utr_install_win }}

From 5d0230cae98a4314a5555b7b6880b832e42b9638 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 14:06:37 +0100
Subject: [PATCH 24/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index f8ffed2730..fc74783d8e 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -15,9 +15,11 @@
     KEEP_TEMP_CODE_COVERAGE_REPORTS: false
   commands:
     - echo %KEEP_TEMP_CODE_COVERAGE_REPORTS%
-    {% assign keep_temp = %KEEP_TEMP_CODE_COVERAGE_REPORTS% %}    
+    - echo true
+    - echo "pretest"
+    {% assign keep_temp = KEEP_TEMP_CODE_COVERAGE_REPORTS %}    
     {% if keep_temp == "false" %}  
-    - echo "test"
+    - echo "test"    
     {% endif %}
     - {{ utr_install_win }}
     - {{ upm_ci_install }}

From 3fb2d6146c19a79d07bb1d5ea394c372c1393384 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 14:14:11 +0100
Subject: [PATCH 25/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index fc74783d8e..9635acd37c 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -18,7 +18,7 @@
     - echo true
     - echo "pretest"
     {% assign keep_temp = KEEP_TEMP_CODE_COVERAGE_REPORTS %}    
-    {% if keep_temp == "false" %}  
+    {% if keep_temp %}  
     - echo "test"    
     {% endif %}
     - {{ utr_install_win }}

From 7ff199769f1c84503912d9ab713bcee785e2ef01 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 14:27:38 +0100
Subject: [PATCH 26/36] 13

---
 .yamato/config.metadata | 2 ++
 .yamato/upm-ci.yml      | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.yamato/config.metadata b/.yamato/config.metadata
index 76a5361f54..c25697c7db 100644
--- a/.yamato/config.metadata
+++ b/.yamato/config.metadata
@@ -88,3 +88,5 @@ instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos
 
 yamato_source_dir_win: "%YAMATO_SOURCE_DIR%"
 yamato_source_dir_nix: ${YAMATO_SOURCE_DIR}
+
+keep_temp_coverage_reports: true
diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 9635acd37c..67a57289fd 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -17,8 +17,8 @@
     - echo %KEEP_TEMP_CODE_COVERAGE_REPORTS%
     - echo true
     - echo "pretest"
-    {% assign keep_temp = KEEP_TEMP_CODE_COVERAGE_REPORTS %}    
-    {% if keep_temp %}  
+    {% assign keep_temp_coverage_reports = KEEP_TEMP_CODE_COVERAGE_REPORTS %}    
+    {% if keep_temp_coverage_reports %}  
     - echo "test"    
     {% endif %}
     - {{ utr_install_win }}

From 68dba2ff3a2c7ad9e5f6593d36ecce1ea87f168f Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 14:32:53 +0100
Subject: [PATCH 27/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 67a57289fd..0b1ea570f0 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -18,7 +18,7 @@
     - echo true
     - echo "pretest"
     {% assign keep_temp_coverage_reports = KEEP_TEMP_CODE_COVERAGE_REPORTS %}    
-    {% if keep_temp_coverage_reports %}  
+    {% if keep_temp_coverage_reports != true %}  
     - echo "test"    
     {% endif %}
     - {{ utr_install_win }}

From bcae9a0b591740f758734a39783b83d3ef63bcc6 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 15:16:09 +0100
Subject: [PATCH 28/36] now maybe

---
 .yamato/upm-ci.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 0b1ea570f0..30e5eedb61 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -13,14 +13,7 @@
   variables:
     EDITOR_VERSION: {{ editor.version }}
     KEEP_TEMP_CODE_COVERAGE_REPORTS: false
-  commands:
-    - echo %KEEP_TEMP_CODE_COVERAGE_REPORTS%
-    - echo true
-    - echo "pretest"
-    {% assign keep_temp_coverage_reports = KEEP_TEMP_CODE_COVERAGE_REPORTS %}    
-    {% if keep_temp_coverage_reports != true %}  
-    - echo "test"    
-    {% endif %}
+  commands:    
     - {{ utr_install_win }}
     - {{ upm_ci_install }}
     # Get version 2.3.0-preview of doctools package (it currently fails for 3.0.0-preview).
@@ -49,9 +42,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 = KEEP_TEMP_CODE_COVERAGE_REPORTS %}
-    {% if keep_temp == false %}  
+    #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"
     - 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"

From 37e2f7a20695941001c5a2a10e29b724823507ef Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 16:14:48 +0100
Subject: [PATCH 29/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 30e5eedb61..fab06fc032 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -14,6 +14,8 @@
     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 }}
     - {{ utr_install_win }}
     - {{ upm_ci_install }}
     # Get version 2.3.0-preview of doctools package (it currently fails for 3.0.0-preview).

From 963e0860e5e6f97d981e92bd2ace5f966206aeda Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 16:18:47 +0100
Subject: [PATCH 30/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index fab06fc032..678bfeb82f 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -14,7 +14,7 @@
     EDITOR_VERSION: {{ editor.version }}
     KEEP_TEMP_CODE_COVERAGE_REPORTS: false
   commands:    
-    {% assign keep_temp_coverage_reports = KEEP_TEMP_CODE_COVERAGE_REPORTS %}    
+    {% assign keep_temp_coverage_reports = %KEEP_TEMP_CODE_COVERAGE_REPORTS% %}    
     - echo {{ keep_temp_coverage_reports }}
     - {{ utr_install_win }}
     - {{ upm_ci_install }}

From 4a8bd776eab46c4532e406da32da5ba8e9443c9a Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 16:19:49 +0100
Subject: [PATCH 31/36] Revert "Update upm-ci.yml"

This reverts commit 963e0860e5e6f97d981e92bd2ace5f966206aeda.
---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 678bfeb82f..fab06fc032 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -14,7 +14,7 @@
     EDITOR_VERSION: {{ editor.version }}
     KEEP_TEMP_CODE_COVERAGE_REPORTS: false
   commands:    
-    {% assign keep_temp_coverage_reports = %KEEP_TEMP_CODE_COVERAGE_REPORTS% %}    
+    {% assign keep_temp_coverage_reports = KEEP_TEMP_CODE_COVERAGE_REPORTS %}    
     - echo {{ keep_temp_coverage_reports }}
     - {{ utr_install_win }}
     - {{ upm_ci_install }}

From 5d140f5329ad90cf3c5ea1a5564edb35db1f825b Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 16:26:01 +0100
Subject: [PATCH 32/36] Update upm-ci.yml

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index fab06fc032..678bfeb82f 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -14,7 +14,7 @@
     EDITOR_VERSION: {{ editor.version }}
     KEEP_TEMP_CODE_COVERAGE_REPORTS: false
   commands:    
-    {% assign keep_temp_coverage_reports = KEEP_TEMP_CODE_COVERAGE_REPORTS %}    
+    {% assign keep_temp_coverage_reports = %KEEP_TEMP_CODE_COVERAGE_REPORTS% %}    
     - echo {{ keep_temp_coverage_reports }}
     - {{ utr_install_win }}
     - {{ upm_ci_install }}

From 194a6926b3f68201954085a73bc07cd6127aa35f Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 16:49:55 +0100
Subject: [PATCH 33/36] remove the env var and just delete pre-merge reports

---
 .yamato/upm-ci.yml | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 678bfeb82f..13365468c1 100644
--- a/.yamato/upm-ci.yml
+++ b/.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

From 1578392891043f5b30b9627a549961d336dd5d10 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 16:57:38 +0100
Subject: [PATCH 34/36] fix too many double quotes

---
 .yamato/upm-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index 13365468c1..f0c00535c2 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -77,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;pathReplacePatterns:@*,,Library/PackageCache,Packages" " --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

From 6e0ddc5ee43b461b8048950cba34fff15dc216e8 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 18:16:52 +0100
Subject: [PATCH 35/36] delete pre-merge reports

---
 .yamato/upm-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml
index f0c00535c2..c4d550e511 100644
--- a/.yamato/upm-ci.yml
+++ b/.yamato/upm-ci.yml
@@ -95,6 +95,8 @@
     {% if platform.name == "linux" %}
     - '{{ yamato_source_dir_nix }}/.Editor/Unity -projectPath {{ yamato_source_dir_nix }} -batchmode -debugCodeOptimization -enableCodeCoverage -coverageResultsPath {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/ -coverageOptions "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem;sourcePaths:{{ yamato_source_dir_nix }}/Packages/com.unity.inputsystem/" -quit' 
     {% endif %}
+    - rm -rf {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package
+    - rm -rf {{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project  
   after:
     - {{ instabilities_install_nix }}
     - {{ platform.instabilities_run }}

From cd531703d860a5e6747afc0716d83e8441a75544 Mon Sep 17 00:00:00 2001
From: Stefan Schubert <stefan@unity3d.com>
Date: Fri, 10 Jan 2025 20:18:16 +0100
Subject: [PATCH 36/36] remove unused variable again

---
 .yamato/config.metadata | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.yamato/config.metadata b/.yamato/config.metadata
index c25697c7db..76a5361f54 100644
--- a/.yamato/config.metadata
+++ b/.yamato/config.metadata
@@ -88,5 +88,3 @@ instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos
 
 yamato_source_dir_win: "%YAMATO_SOURCE_DIR%"
 yamato_source_dir_nix: ${YAMATO_SOURCE_DIR}
-
-keep_temp_coverage_reports: true