Skip to content

Commit 8efd8f8

Browse files
committed
Corrected PR trigger definition and added initial check as dependency of project pack job
1 parent 302c3e4 commit 8efd8f8

File tree

3 files changed

+11
-23
lines changed

3 files changed

+11
-23
lines changed

.yamato/_run-all.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
run_quick_checks:
1616
name: Run Quick Initial Checks
1717
dependencies:
18-
- .yamato/package-pack.yml#package_pack_-_ngo_win
19-
- .yamato/package-pack.yml#package_pack_-_ngo_mac
2018
- .yamato/package-pack.yml#package_pack_-_ngo_ubuntu
2119
- .yamato/project-standards.yml#standards_win_testproject_trunk
2220

.yamato/_triggers.yml

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,31 +38,13 @@
3838

3939
#-----------------------------------------------------------------------------------
4040

41-
initial_pull_request_trigger:
42-
name: (INITIAL) Pull Request Trigger (develop, develop-2.0.0, & release branches)
43-
dependencies:
44-
# Run fast checks that allow for detection of the simplest issues
45-
- .yamato/_run-all.yml#run_quick_checks
46-
triggers:
47-
cancel_old_ci: true
48-
pull_requests:
49-
- targets:
50-
only:
51-
- "develop"
52-
- "develop-2.0.0"
53-
- "/release\/.*/"
54-
- drafts: false
55-
5641
# Run all relevant tasks when a pull request targeting the develop or release branch is created or updated.
5742
# 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.
58-
# This job will FIRST run "run_quick_checks" jobs (defined in _run-all.yml) which runs the fastest checks (like PVP or code standards) and ONLY IF those pass it will run the rest of the tests.
43+
# This job will FIRST run "run_quick_checks" jobs (defined in _run-all.yml) since it's the dependency of project pack jobs which is on the lowest dependency tier. This runs the fastest checks (like PVP or code standards) and ONLY IF those pass it will run the rest of the tests.
5944
# This optimization allows to speed up feedback look for any "obvious" errors and save resources.
60-
# THIS JOB WILL NOT RUN IF THE INITIAL JOB FAILS (the one above. For example if the code standards fail)
61-
extended_pull_request_trigger:
45+
pull_request_trigger:
6246
name: Pull Request Trigger (develop, develop-2.0.0, & release branches)
6347
dependencies:
64-
# Run fast checks that allow for detection of the simplest issues (Needs to be included as dependency to make the expression at the bottom of this job possible)
65-
- .yamato/_triggers.yml#initial_pull_request_trigger
6648
# Run project standards to verify package/default project. This is fine to just run for trunk
6749
- .yamato/project-standards.yml#standards_ubuntu_testproject_trunk
6850
# Run package EditMode and Playmode package tests on trunk
@@ -78,7 +60,13 @@ extended_pull_request_trigger:
7860
- .yamato/desktop-standalone-tests.yml#desktop_standalone_test_testproject_win_mono_6000.0
7961
triggers:
8062
cancel_old_ci: true
81-
expression: pull_request.dependencies.initial_pull_request_trigger.status == "success"
63+
pull_requests:
64+
- targets:
65+
only:
66+
- "develop"
67+
- "develop-2.0.0"
68+
- "/release\/.*/"
69+
- drafts: false
8270

8371

8472
# Run all tests on trunk on nightly basis.

.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
3840
artifacts:
3941
packages:
4042
paths:

0 commit comments

Comments
 (0)