From ff62574283b24d8d2323d3122ee3e5514d2417e2 Mon Sep 17 00:00:00 2001 From: Nikos Chagialas Date: Wed, 4 Dec 2024 11:29:33 +0000 Subject: [PATCH 01/12] Added code coverage step --- .yamato/config.metadata | 6 +++--- .yamato/upm-ci.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 4e88db5dc1..0c44fbdb9c 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -17,16 +17,16 @@ upm_ci_install: npm install -g upm-ci-utils@stable --registry https://artifactor platforms_win: - name: win type: Unity::VM - image: package-ci/win10:default + image: package-ci/win10:v4 flavor: b1.large - name: win_standalone type: Unity::VM - image: package-ci/win10:default + image: package-ci/win10:v4 flavor: b1.large runtime: StandaloneWindows64 - name: win_standalone_il2cpp type: Unity::VM - image: package-ci/win10:default + image: package-ci/win10:v4 flavor: b1.large runtime: StandaloneWindows64 scripting-backend: Il2Cpp diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 0e703a7226..a0470e6890 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -23,7 +23,7 @@ - move /Y .\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 }} + - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }} -enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" {% if platform.installscript %} - {{ unity_downloader_install }} - {{ platform.installscript }} {{ editor.version }} @@ -33,7 +33,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 + - ./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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Project after: - {{ instabilities_install_win }} - {{ instabilities_run_win }} From 7d95f3c7531bd8aeb970f1744ec3595c49a534ca Mon Sep 17 00:00:00 2001 From: Nikos Chagialas Date: Wed, 4 Dec 2024 12:13:21 +0000 Subject: [PATCH 02/12] Fixed typo --- .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 a0470e6890..07cd49318f 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -23,7 +23,7 @@ - move /Y .\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 }} -enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" + - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" {% if platform.installscript %} - {{ unity_downloader_install }} - {{ platform.installscript }} {{ editor.version }} From d5dc7fb9eb082b10e0c8516173745b7a73316f3a Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Wed, 4 Dec 2024 15:20:20 +0100 Subject: [PATCH 03/12] add coverage options to *nix platforms --- .yamato/upm-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 07cd49318f..ede2e67539 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -64,7 +64,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 }} + - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" {% if platform.installscript %} - {{ unity_downloader_install }} - {{ platform.installscript }} {{ editor.version }} @@ -74,7 +74,7 @@ - mv ./Packages/com.unity.inputsystem/Samples ./Assets - 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" %} --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 + - ./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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Project after: - {{ instabilities_install_nix }} - {{ platform.instabilities_run }} From 0b6664b47d6691e3b2003b6fbbd2d24dd707586b Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Wed, 4 Dec 2024 15:22:56 +0100 Subject: [PATCH 04/12] add generateTestReferences option --- .yamato/upm-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index ede2e67539..58a1d0ce8c 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -23,7 +23,7 @@ - move /Y .\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 }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" + - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;generateTestReferences;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" {% if platform.installscript %} - {{ unity_downloader_install }} - {{ platform.installscript }} {{ editor.version }} @@ -33,7 +33,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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;generateTestReferences;assemblyFilters:+Unity.InputSystem" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Project after: - {{ instabilities_install_win }} - {{ instabilities_run_win }} @@ -64,7 +64,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 }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" + - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;generateTestReferences;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" {% if platform.installscript %} - {{ unity_downloader_install }} - {{ platform.installscript }} {{ editor.version }} @@ -74,7 +74,7 @@ - mv ./Packages/com.unity.inputsystem/Samples ./Assets - 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" %} --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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/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" %} --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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;generateTestReferences;assemblyFilters:+Unity.InputSystem" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Project after: - {{ instabilities_install_nix }} - {{ platform.instabilities_run }} From 9689a3fc875b2b5242d5a9bfa361ce7ca2b35794 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Fri, 6 Dec 2024 14:09:12 +0100 Subject: [PATCH 05/12] Revert "add generateTestReferences option" This reverts commit 0b6664b47d6691e3b2003b6fbbd2d24dd707586b. --- .yamato/upm-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 58a1d0ce8c..ede2e67539 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -23,7 +23,7 @@ - move /Y .\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 }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;generateTestReferences;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" + - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" {% if platform.installscript %} - {{ unity_downloader_install }} - {{ platform.installscript }} {{ editor.version }} @@ -33,7 +33,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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;generateTestReferences;assemblyFilters:+Unity.InputSystem" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Project after: - {{ instabilities_install_win }} - {{ instabilities_run_win }} @@ -64,7 +64,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 }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;generateTestReferences;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" + - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" {% if platform.installscript %} - {{ unity_downloader_install }} - {{ platform.installscript }} {{ editor.version }} @@ -74,7 +74,7 @@ - mv ./Packages/com.unity.inputsystem/Samples ./Assets - 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" %} --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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;generateTestReferences;assemblyFilters:+Unity.InputSystem" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/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" %} --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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Project after: - {{ instabilities_install_nix }} - {{ platform.instabilities_run }} From 821aac66031306f305552d6269dd507d4dfbb3ff Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Mon, 9 Dec 2024 11:03:08 +0100 Subject: [PATCH 06/12] Update config.metadata --- .yamato/config.metadata | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 0c44fbdb9c..89d1cddbf7 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -34,18 +34,18 @@ platforms_win: platforms_nix: - name: mac type: Unity::VM::osx - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 flavor: m1.mac instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0 - name: mac_standalone type: Unity::VM::osx - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 flavor: m1.mac instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0 runtime: StandaloneOSX - name: mac_standalone_il2cpp type: Unity::VM::osx - image: package-ci/macos-13:default + image: package-ci/macos-13:v4 flavor: m1.mac instabilities_run: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0 runtime: StandaloneOSX From 4580a80facb1e47a289664cd98084b5d082d9ea1 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Mon, 9 Dec 2024 13:00:21 +0100 Subject: [PATCH 07/12] fix wrong source dir paths --- .yamato/config.metadata | 5 ++++- .yamato/upm-ci.yml | 25 +++++++++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.yamato/config.metadata b/.yamato/config.metadata index 89d1cddbf7..76a5361f54 100644 --- a/.yamato/config.metadata +++ b/.yamato/config.metadata @@ -84,4 +84,7 @@ instabilities_install_win: curl -s https://artifactory.prd.it.unity3d.com/artifa instabilities_run_win: run_standalone_instability_detection-latest.bat 0.5.1 || exit 0 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 -instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0 \ No newline at end of file +instabilities_run_mac: sh ./run_standalone_instability_detection-latest.sh macos 0.5.1 || exit 0 + +yamato_source_dir_win: "%YAMATO_SOURCE_DIR%" +yamato_source_dir_nix: ${YAMATO_SOURCE_DIR} diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index ede2e67539..28519ef453 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -23,7 +23,9 @@ - move /Y .\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 }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" + - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }} + --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" + --extra-utr-arg="--coverage-results-path=yamato_source_dir_win/upm-ci~/test-results/CodeCoverage/Package" {% if platform.installscript %} - {{ unity_downloader_install }} - {{ platform.installscript }} {{ editor.version }} @@ -33,7 +35,13 @@ - 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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/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 %} after: - {{ instabilities_install_win }} - {{ instabilities_run_win }} @@ -64,7 +72,9 @@ - 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 }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --extra-utr-arg="--coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/Package" + - upm-ci package test --package-path ./Packages/com.unity.inputsystem/ -u {{ editor.version }} + --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" {% if platform.installscript %} - {{ unity_downloader_install }} - {{ platform.installscript }} {{ editor.version }} @@ -74,7 +84,14 @@ - mv ./Packages/com.unity.inputsystem/Samples ./Assets - 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" %} --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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path=%YAMATO_SOURCE_DIR%/upm-ci~/test-results/CodeCoverage/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 %} after: - {{ instabilities_install_nix }} - {{ platform.instabilities_run }} From 4666629a5f418910f5a50196d301e134f04af667 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Mon, 9 Dec 2024 13:24:16 +0100 Subject: [PATCH 08/12] forgot curly braces for variable --- .yamato/upm-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 28519ef453..98ecaee834 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -25,7 +25,7 @@ # 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 }} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" - --extra-utr-arg="--coverage-results-path=yamato_source_dir_win/upm-ci~/test-results/CodeCoverage/Package" + --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" {% if platform.installscript %} - {{ unity_downloader_install }} - {{ platform.installscript }} {{ editor.version }} @@ -41,7 +41,7 @@ {% 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 %} + --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project {% endif %} after: - {{ instabilities_install_win }} - {{ instabilities_run_win }} @@ -74,7 +74,7 @@ # 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 }} --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" + --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Package" {% if platform.installscript %} - {{ unity_downloader_install }} - {{ platform.installscript }} {{ editor.version }} @@ -91,7 +91,7 @@ {% 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 %} + --coverage-results-path={{ yamato_source_dir_nix }}/upm-ci~/test-results/CodeCoverage/Project {% endif %} after: - {{ instabilities_install_nix }} - {{ platform.instabilities_run }} From f0bbb1c355f47ff68fa03cbf0af33b7b11fd1f9b Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Mon, 9 Dec 2024 14:37:55 +0100 Subject: [PATCH 09/12] more ifs to run package integration tests only on editor platforms --- .yamato/upm-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 98ecaee834..fe3081c744 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -24,8 +24,8 @@ - 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 }} - --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" - --extra-utr-arg="--coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Package" + {% if platform.name == "win" %} --enable-code-coverage --code-coverage-options "generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+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 }} - {{ platform.installscript }} {{ editor.version }} @@ -73,8 +73,8 @@ - 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 }} - --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" + {% 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 %} {% if platform.installscript %} - {{ unity_downloader_install }} - {{ platform.installscript }} {{ editor.version }} @@ -90,7 +90,7 @@ {% 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" + {% 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 %} after: - {{ instabilities_install_nix }} From 722b213c80408810d8a57fe15b2ff48c9e7c5832 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 10 Dec 2024 11:34:43 +0100 Subject: [PATCH 10/12] Update upm-ci.yml --- .yamato/upm-ci.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index fe3081c744..06b0615d2d 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -35,13 +35,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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/Project after: - {{ instabilities_install_win }} - {{ instabilities_run_win }} From 0bae21841bf6dc6fd84664ca1e9808cd23c7060a Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 10 Dec 2024 12:11:40 +0100 Subject: [PATCH 11/12] try to gate project test code coverage to just editor --- .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 06b0615d2d..427a368302 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -35,7 +35,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 --enable-code-coverage --coverage-options="generateAdditionalMetrics;generateHtmlReport;assemblyFilters:+Unity.InputSystem" --coverage-results-path={{ yamato_source_dir_win }}/upm-ci~/test-results/CodeCoverage/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 %} after: - {{ instabilities_install_win }} - {{ instabilities_run_win }} From 97ae6b31fe9348cbd2772b2ee69922339801c72a Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Tue, 10 Dec 2024 12:56:33 +0100 Subject: [PATCH 12/12] Update upm-ci.yml --- .yamato/upm-ci.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.yamato/upm-ci.yml b/.yamato/upm-ci.yml index 427a368302..e71735f993 100644 --- a/.yamato/upm-ci.yml +++ b/.yamato/upm-ci.yml @@ -66,9 +66,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" --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 }} @@ -78,14 +76,7 @@ - mv ./Packages/com.unity.inputsystem/Samples ./Assets - 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 %} + - ./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 %} after: - {{ instabilities_install_nix }} - {{ platform.instabilities_run }}