Skip to content

Commit ba1bc97

Browse files
Merge branch 'develop' into renovate/develop-recipeengine.modules.wrench-0.x
2 parents 5f7bf42 + 90c00cd commit ba1bc97

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

.yamato/_run-all.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@
1010

1111
#-----------------------------------------------------------------------------------
1212

13+
# This job runs the fastest checks (PVP and code standards)
14+
# This is mainly used to quickly validate the easy mistakes before for example running PR trigger jobs (see _triggers.yml)
15+
run_quick_checks:
16+
name: Run Quick Initial Checks
17+
dependencies:
18+
- .yamato/package-pack.yml#package_pack_-_ngo_ubuntu
19+
- .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
1320

1421
# Runs all package tests
1522
run_all_package_tests:

.yamato/_triggers.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
#-----------------------------------------------------------------------------------
4040

4141
# Run all relevant tasks when a pull request targeting the develop or release branch is created or updated.
42+
# 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.
43+
# Since standards job is a part of initial checks it's not present as direct dependency here
4244
pull_request_trigger:
4345
name: Pull Request Trigger (develop, develop-2.0.0, & release branches)
4446
dependencies:
45-
# Run project standards to verify package/default project. This is fine to just run for trunk
46-
- .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
4747
# Run package EditMode and Playmode package tests on trunk
4848
- .yamato/_run-all.yml#run_all_package_tests_trunk
4949
# Run package EditMode and Playmode package tests on minimum supported editor (2021.3 in case of NGOv1.X)
@@ -52,8 +52,8 @@ pull_request_trigger:
5252
- .yamato/_run-all.yml#run_all_project_tests_trunk
5353
# Run project EditMode and PLaymode project tests on minimum supported editor (2021.3 in case of NGOv1.X)
5454
- .yamato/_run-all.yml#run_all_project_tests_2021
55-
# 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)
56-
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_il2cpp_trunk
55+
# 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.
56+
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_mac_il2cpp_trunk
5757
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_mono_2021.3
5858
triggers:
5959
cancel_old_ci: true
@@ -103,9 +103,6 @@ develop_nightly:
103103
# Build player for webgl platform on trunk and 2021 editors
104104
- .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_ubuntu_trunk
105105
- .yamato/project-updated-dependencies-test.yml#updated-dependencies_testproject_NGO_win_2021.3
106-
# Clean import test
107-
- .yamato/clean-import-job.yml#clean_import_testproject_trunk
108-
- .yamato/clean-import-job.yml#clean_import_testproject_2021.3
109106

110107

111108
# Run all tests on weekly bases

.yamato/package-tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ package_test_-_ngo_{{ editor }}_{{ platform.name }}:
5454
- "upm-ci~/test-results/**/*"
5555
- "pvp-results/*"
5656
dependencies:
57+
- .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors
5758
- .yamato/package-pack.yml#package_pack_-_ngo_{{ platform.name }}
5859
{% endfor -%}
5960
{% endfor -%}

.yamato/project-pack.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ project_pack_-_{{ project.name }}_{{ platform.name }}:
3535
commands:
3636
- 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
3737
- upm-ci project pack --project-path {{ project.path }}
38+
dependencies:
39+
- .yamato/_run-all.yml#run_quick_checks # initial checks to perform fast validation of common errors
3840
artifacts:
3941
packages:
4042
paths:

0 commit comments

Comments
 (0)