From 36a5fd791609986107abbcd19386d197a674524d Mon Sep 17 00:00:00 2001 From: Emma Date: Fri, 11 Jul 2025 12:02:11 -0400 Subject: [PATCH 1/5] chore: Reduce the number of jobs running on PR triggers --- .yamato/_triggers.yml | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 112809026f..a3143f7df3 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -43,15 +43,20 @@ # 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) + # Run the following tests on a selection of different desktop platforms dependencies: - # 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) - - .yamato/_run-all.yml#run_all_package_tests_2021 - # Run project EditMode and PLaymode project tests on trunk - - .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 package EditMode and Playmode package tests on trunk and minimum supported editor (2021.3 in case of NGOv1.X) + - .yamato/project-tests.yml#test_testproject_mac_trunk + - .yamato/package-tests.yml#package_test_-_ngo_2021.3_win + + # Run testproject EditMode and Playmode project tests on trunk and minimum supported editor (2021.3 in case of NGOv1.X) + - .yamato/project-tests.yml#test_testproject_win_trunk + - .yamato/project-tests.yml#test_testproject_mac_2021.3 + + # Run tools integration tests EditMode and Playmode tests on trunk and minimum supported editor (2021.3 in case of NGOv1.X) + - .yamato/project-tests.yml#test_testproject-tools-integration_ubuntu_2021.3 + - .yamato/project-tests.yml#test_testproject-tools-integration_win_trunk + # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_2021.3 @@ -64,7 +69,7 @@ pull_request_trigger: - "develop-2.0.0" - "/release\/.*/" - drafts: false - + # Run all tests on trunk on nightly basis. # Same subset as pull_request_trigger with addition of mobile/desktop/console tests and webgl builds @@ -85,7 +90,7 @@ develop_nightly: # Run package EditMode and Playmode tests on desktop platforms on trunk and 2021.3 - .yamato/_run-all.yml#run_all_package_tests_trunk - .yamato/_run-all.yml#run_all_package_tests_2021 - # Run project EditMode and PLaymode tests on desktop platforms on trunk and 2021.3 + # Run project EditMode and PLaymode tests on desktop platforms on trunk and 2021.3 - .yamato/_run-all.yml#run_all_project_tests_trunk - .yamato/_run-all.yml#run_all_project_tests_2021 # Run Runtime tests on desktop players on trunk and 2021 editors @@ -132,4 +137,4 @@ develop_weekly_trunk: # Build player for webgl platform on trunk - .yamato/_run-all.yml#run_all_webgl_builds # Run code coverage test - - .yamato/code-coverage.yml#code_coverage_ubuntu_trunk \ No newline at end of file + - .yamato/code-coverage.yml#code_coverage_ubuntu_trunk From b80fc9e940a93b5c2a7870294abfc1261047e9fe Mon Sep 17 00:00:00 2001 From: Emma Date: Fri, 11 Jul 2025 12:07:44 -0400 Subject: [PATCH 2/5] Run the package tests on mac --- .yamato/_triggers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index a3143f7df3..645ab6e380 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -46,7 +46,7 @@ pull_request_trigger: # Run the following tests on a selection of different desktop platforms dependencies: # Run package EditMode and Playmode package tests on trunk and minimum supported editor (2021.3 in case of NGOv1.X) - - .yamato/project-tests.yml#test_testproject_mac_trunk + - .yamato/package-tests.yml#package_test_-_ngo_trunk_mac - .yamato/package-tests.yml#package_test_-_ngo_2021.3_win # Run testproject EditMode and Playmode project tests on trunk and minimum supported editor (2021.3 in case of NGOv1.X) From 8cb9bd4ab6b083ed03c13a88653a51596c19eddb Mon Sep 17 00:00:00 2001 From: Emma Date: Fri, 11 Jul 2025 14:11:06 -0400 Subject: [PATCH 3/5] Swap 2021.3 for 2022.3 as we're ending support for 2021.3 in October --- .yamato/_triggers.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index 645ab6e380..ca0cd4e4ad 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -45,21 +45,21 @@ pull_request_trigger: name: Pull Request Trigger (develop, develop-2.0.0, & release branches) # Run the following tests on a selection of different desktop platforms dependencies: - # Run package EditMode and Playmode package tests on trunk and minimum supported editor (2021.3 in case of NGOv1.X) + # Run package EditMode and Playmode package tests on trunk and an older supported editor (2022.3) - .yamato/package-tests.yml#package_test_-_ngo_trunk_mac - - .yamato/package-tests.yml#package_test_-_ngo_2021.3_win + - .yamato/package-tests.yml#package_test_-_ngo_2022.3_win - # Run testproject EditMode and Playmode project tests on trunk and minimum supported editor (2021.3 in case of NGOv1.X) + # Run testproject EditMode and Playmode project tests on trunk and an older supported editor (2022.3) - .yamato/project-tests.yml#test_testproject_win_trunk - - .yamato/project-tests.yml#test_testproject_mac_2021.3 + - .yamato/project-tests.yml#test_testproject_mac_2022.3 - # Run tools integration tests EditMode and Playmode tests on trunk and minimum supported editor (2021.3 in case of NGOv1.X) - - .yamato/project-tests.yml#test_testproject-tools-integration_ubuntu_2021.3 + # Run tools integration tests EditMode and Playmode tests on trunk and an older supported editor (2022.3) + - .yamato/project-tests.yml#test_testproject-tools-integration_ubuntu_2022.3 - .yamato/project-tests.yml#test_testproject-tools-integration_win_trunk # Run standalone test. We run it only on Ubuntu since it's the fastest machine, and it was noted that for example distribution on macOS is taking 40m since we switched to Apple Silicon # Coverage on other standalone machines is present in Nightly job so it's enough to not run all of them for PRs - - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_2021.3 + - .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_ubuntu_il2cpp_2022.3 triggers: cancel_old_ci: true pull_requests: From d284ae3a9ac98ad8a6bcf8e2c16f76e307a6af1a Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Mon, 14 Jul 2025 10:42:49 +0200 Subject: [PATCH 4/5] added comment --- .yamato/_triggers.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.yamato/_triggers.yml b/.yamato/_triggers.yml index ca0cd4e4ad..bb27d1219b 100644 --- a/.yamato/_triggers.yml +++ b/.yamato/_triggers.yml @@ -45,15 +45,15 @@ pull_request_trigger: name: Pull Request Trigger (develop, develop-2.0.0, & release branches) # Run the following tests on a selection of different desktop platforms dependencies: - # Run package EditMode and Playmode package tests on trunk and an older supported editor (2022.3) + # Run package EditMode and Playmode package tests on trunk and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor) - .yamato/package-tests.yml#package_test_-_ngo_trunk_mac - .yamato/package-tests.yml#package_test_-_ngo_2022.3_win - # Run testproject EditMode and Playmode project tests on trunk and an older supported editor (2022.3) + # Run testproject EditMode and Playmode project tests on trunk and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor) - .yamato/project-tests.yml#test_testproject_win_trunk - .yamato/project-tests.yml#test_testproject_mac_2022.3 - # Run tools integration tests EditMode and Playmode tests on trunk and an older supported editor (2022.3) + # Run tools integration tests EditMode and Playmode tests on trunk and an older supported editor (2022.3) (2022.3 will soon be a minimum supported editor) - .yamato/project-tests.yml#test_testproject-tools-integration_ubuntu_2022.3 - .yamato/project-tests.yml#test_testproject-tools-integration_win_trunk From 79f7dc83d164cce20cd072d22c26693aaac831f8 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Mon, 14 Jul 2025 11:04:10 +0200 Subject: [PATCH 5/5] Used the occasion to update editor list --- .yamato/project.metafile | 1 + 1 file changed, 1 insertion(+) diff --git a/.yamato/project.metafile b/.yamato/project.metafile index d2b6a1b75f..4961ee08c3 100644 --- a/.yamato/project.metafile +++ b/.yamato/project.metafile @@ -159,6 +159,7 @@ validation_editors: - 2022.3 - 6000.0 - 6000.1 + - 6000.2 - trunk