From 0fd75a3b3eece53f44ac34f29c35a65aac039005 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 16 Apr 2025 11:13:47 +0200 Subject: [PATCH 01/10] Modified PR trigger job to use both win and mac platforms --- .yamato/_triggers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index e3e42504f4..1418e26f1d 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -53,7 +53,7 @@ pull_request_trigger: # Run project EditMode and PLaymode project tests on minimum supported editor (2021.3 in case of NGOv1.X) - .yamato/_run-all.yml#run_all_project_tests_2021 # Run one standalone test to make sure there are no obvious issues with most common platform (for example --fail-on-assert option is not present with package/project tests). We run 2 different combinations (platform/editor) - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_il2cpp_trunk + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_mac_il2cpp_trunk - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_mono_2021.3 triggers: cancel_old_ci: true From 094b006e8ae249a55d91010fbe00cb75218581cb Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 16 Apr 2025 11:17:07 +0200 Subject: [PATCH 02/10] Removed non existing jobs in nightly trigger --- .yamato/_triggers.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 1418e26f1d..56a8fbb21c 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -103,9 +103,6 @@ develop_nightly: # Build player for webgl platform on trunk and 2021 editors - .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_ubuntu_trunk - .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_win_2021.3 - # Clean import test - - .yamato/clean-import-job.yml#clean_import_testproject_trunk - - .yamato/clean-import-job.yml#clean_import_testproject_2021.3 # Run all tests on weekly bases From 49f9237faa57939d76768ab811c350a30ad2172c Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 16 Apr 2025 11:22:08 +0200 Subject: [PATCH 03/10] Added comment and modified combination for nightly trigger --- .yamato/_triggers.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 56a8fbb21c..9bdf45abe7 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -39,6 +39,7 @@ #----------------------------------------------------------------------------------- # Run all relevant tasks when a pull request targeting the develop or release branch is created or updated. +# In order to have better coverage we run desktop standalone tests with different configurations which allows to mostly cover for different platforms, scripting backends and editor versions. pull_request_trigger: name: Pull Request Trigger (develop, develop-2.0.0, & release branches) dependencies: @@ -52,7 +53,7 @@ pull_request_trigger: - .yamato/_run-all.yml#run_all_project_tests_trunk # Run project EditMode and PLaymode project tests on minimum supported editor (2021.3 in case of NGOv1.X) - .yamato/_run-all.yml#run_all_project_tests_2021 - # Run one standalone test to make sure there are no obvious issues with most common platform (for example --fail-on-assert option is not present with package/project tests). We run 2 different combinations (platform/editor) + # Run standalone test with mixture of parameters to make sure there are no obvious issues with most common platform (for example --fail-on-assert option is not present with package/project tests). We run 2 different combinations with different platform/editor/scripting backend. - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_mac_il2cpp_trunk - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_mono_2021.3 triggers: @@ -78,7 +79,7 @@ develop_nightly: rerun: always dependencies: # Run project standards to verify package/default project - - .yamato/project-standards.yml#standards_ubuntu_testproject_trunk + - .yamato/project-standards.yml#standards_win_testproject_trunk - .yamato/project-standards.yml#standards_ubuntu_testproject_2021.3 # Run APV jobs to make sure the change won't break any dependants - .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs From e8b2a881f9c78dfd9b4d334b3fd607283f4fc959 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 16 Apr 2025 11:27:21 +0200 Subject: [PATCH 04/10] Added more project standards configuration options --- .yamato/project-standards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml index dd88c60e68..b4100ec8bf 100644 --- a/.yamato/project-standards.yml +++ b/.yamato/project-standards.yml @@ -28,7 +28,7 @@ #------------------------------------------------------------------------------------ {% for project in projects.all -%} -{% for platform in test_platforms.default -%} +{% for platform in test_platforms.all -%} {% for editor in validation_editors.all -%} standards_{{ platform.name }}_{{ project.name }}_{{ editor }}: name: Standards Check - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}] From 724fb3fad8b71e1f6fe596e16789fbcea46039ee Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 16 Apr 2025 11:28:52 +0200 Subject: [PATCH 05/10] corrected typo --- .yamato/project-standards.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml index b4100ec8bf..0631450cc3 100644 --- a/.yamato/project-standards.yml +++ b/.yamato/project-standards.yml @@ -28,7 +28,7 @@ #------------------------------------------------------------------------------------ {% for project in projects.all -%} -{% for platform in test_platforms.all -%} +{% for platform in test_platforms.desktop -%} {% for editor in validation_editors.all -%} standards_{{ platform.name }}_{{ project.name }}_{{ editor }}: name: Standards Check - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}] From 0fc3d683c7dbf75a3d40cd525009fe49a2ff2ae6 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 16 Apr 2025 15:06:05 +0200 Subject: [PATCH 06/10] Added run_quick_checks job --- .yamato/_run-all.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.yamato/_run-all.yml b/.yamato/_run-all.yml index 84e4a491fb..453eedbb6d 100644 --- a/.yamato/_run-all.yml +++ b/.yamato/_run-all.yml @@ -10,6 +10,13 @@ #----------------------------------------------------------------------------------- +# This job runs the fastest checks (PVP and code standards) +# This is mainly used to quickly validate the easy mistakes before for example running PR trigger jobs (see _triggers.yml) +run_quick_checks: + name: Run Quick Initial Checks + dependencies: + - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu + - .yamato/project-standards.yml#standards_win_testproject_trunk # Runs all package tests run_all_package_tests: From 433cb088e13bee9d68ced51b92821f0e228a291f Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 16 Apr 2025 15:07:22 +0200 Subject: [PATCH 07/10] Added initial_checks as dependency of project_pack --- .yamato/project-pack.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.yamato/project-pack.yml b/.yamato/project-pack.yml index d9dd6143d5..d3da73ad24 100644 --- a/.yamato/project-pack.yml +++ b/.yamato/project-pack.yml @@ -35,6 +35,8 @@ project_pack_-_{{ project.name }}_{{ platform.name }}: commands: - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm # upm-ci is not preinstalled on the image so we need to download it - upm-ci project pack --project-path {{ project.path }} + dependencies: + - .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors artifacts: packages: paths: From a15fd5990b955a6ae83446cd116c62f45ccd7162 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 16 Apr 2025 15:08:23 +0200 Subject: [PATCH 08/10] Removed project standards dependency from PR trigger --- .yamato/_triggers.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 9bdf45abe7..6761dba7d4 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -40,11 +40,10 @@ # Run all relevant tasks when a pull request targeting the develop or release branch is created or updated. # In order to have better coverage we run desktop standalone tests with different configurations which allows to mostly cover for different platforms, scripting backends and editor versions. +# Since standards job is a part of initial checks it's not present as direct dependency here pull_request_trigger: name: Pull Request Trigger (develop, develop-2.0.0, & release branches) dependencies: - # Run project standards to verify package/default project. This is fine to just run for trunk - - .yamato/project-standards.yml#standards_ubuntu_testproject_trunk # Run package EditMode and Playmode package tests on trunk - .yamato/_run-all.yml#run_all_package_tests_trunk # Run package EditMode and Playmode package tests on minimum supported editor (2021.3 in case of NGOv1.X) From 8cabfbb5b30b9ffa2405381c72ff76898b77b73e Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 16 Apr 2025 15:09:27 +0200 Subject: [PATCH 09/10] Added initial checks dependency to package-tests --- .yamato/package-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.yamato/package-tests.yml b/.yamato/package-tests.yml index 0d354967ae..0e6cda0da5 100644 --- a/.yamato/package-tests.yml +++ b/.yamato/package-tests.yml @@ -54,6 +54,7 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}: - "upm-ci~/test-results/**/*" - "pvp-results/*" dependencies: + - .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors - .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }} {% endfor -%} {% endfor -%} \ No newline at end of file From 86859f6524d950070012b1ab13140db59fa5031b Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 16 Apr 2025 15:33:46 +0200 Subject: [PATCH 10/10] Corrected project stardars platform --- .yamato/_run-all.yml | 2 +- .yamato/_triggers.yml | 2 +- .yamato/project-standards.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.yamato/_run-all.yml b/.yamato/_run-all.yml index 453eedbb6d..039b333b4c 100644 --- a/.yamato/_run-all.yml +++ b/.yamato/_run-all.yml @@ -16,7 +16,7 @@ run_quick_checks: name: Run Quick Initial Checks dependencies: - .yamato/package-pack.yml#package_pack_-_ngo_ubuntu - - .yamato/project-standards.yml#standards_win_testproject_trunk + - .yamato/project-standards.yml#standards_ubuntu_testproject_trunk # Runs all package tests run_all_package_tests: diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 6761dba7d4..6406395852 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -78,7 +78,7 @@ develop_nightly: rerun: always dependencies: # Run project standards to verify package/default project - - .yamato/project-standards.yml#standards_win_testproject_trunk + - .yamato/project-standards.yml#standards_ubuntu_testproject_trunk - .yamato/project-standards.yml#standards_ubuntu_testproject_2021.3 # Run APV jobs to make sure the change won't break any dependants - .yamato/wrench/preview-a-p-v.yml#all_preview_apv_jobs diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml index 0631450cc3..dd88c60e68 100644 --- a/.yamato/project-standards.yml +++ b/.yamato/project-standards.yml @@ -28,7 +28,7 @@ #------------------------------------------------------------------------------------ {% for project in projects.all -%} -{% for platform in test_platforms.desktop -%} +{% for platform in test_platforms.default -%} {% for editor in validation_editors.all -%} standards_{{ platform.name }}_{{ project.name }}_{{ editor }}: name: Standards Check - NGO {{ project.name }} [{{ platform.name }}, {{ editor }}]