Skip to content

Commit 569d4c7

Browse files
zatzuri-unityzatzuri-unity
authored
update wrench jobs (#1073)
1 parent 0db1753 commit 569d4c7

2 files changed

Lines changed: 59 additions & 27 deletions

File tree

‎.yamato/triggers.yml‎

Lines changed: 43 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Auto-generated by Recipe Engine, do not modify manually.
22

3-
# All tests defined in recipes.
3+
# All tests defined in recipes. Run in changes to mainline and release branches.
44
all_trigger:
55
name: All Trigger
66
dependencies:
@@ -111,7 +111,10 @@ all_trigger:
111111
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_ubuntu
112112
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_windows
113113
triggers:
114-
expression: NOT pull_request.draft
114+
branches:
115+
only:
116+
- main
117+
- release[/]\\d+[.]\\d+)
115118

116119
# Nightly check on main
117120
nightly_trigger:
@@ -223,26 +226,48 @@ nightly_trigger:
223226
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_ubuntu
224227
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_windows
225228

226-
# Tests to run on PRs and mainline branches.
227-
package_ci:
228-
name: Package CI
229+
# Tests to run on PRs.
230+
pull_request_tests_trigger:
231+
name: Pull Request Tests Trigger
229232
dependencies:
230-
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_windows
231-
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_macos
233+
- path: .yamato/code-coverage.yml#code_coverage_-_ubuntu_-_trunk
234+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_2022_3_-_ubuntu
235+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_6000_0_-_ubuntu
236+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_6000_1_-_ubuntu
237+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_6000_2_-_ubuntu
238+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrp_-_6000_3_-_ubuntu
239+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrpinputsystem_-_2022_3_-_ubuntu
240+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrpinputsystem_-_6000_0_-_ubuntu
241+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrpinputsystem_-_6000_1_-_ubuntu
242+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrpinputsystem_-_6000_2_-_ubuntu
243+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_hdrpinputsystem_-_6000_3_-_ubuntu
244+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_standalone_-_2022_3_-_ubuntu
245+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_standalone_-_6000_0_-_ubuntu
246+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_standalone_-_6000_1_-_ubuntu
247+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_standalone_-_6000_2_-_ubuntu
248+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_standalone_-_6000_3_-_ubuntu
249+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_standaloneinputsystem_-_2022_3_-_ubuntu
250+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_standaloneinputsystem_-_6000_0_-_ubuntu
251+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_standaloneinputsystem_-_6000_1_-_ubuntu
252+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_standaloneinputsystem_-_6000_2_-_ubuntu
253+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_standaloneinputsystem_-_6000_3_-_ubuntu
254+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_2022_3_-_ubuntu
255+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_0_-_ubuntu
256+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_1_-_ubuntu
257+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_2_-_ubuntu
258+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_urp_-_6000_3_-_ubuntu
259+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_urpinputsystem_-_2022_3_-_ubuntu
260+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_urpinputsystem_-_6000_0_-_ubuntu
261+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_urpinputsystem_-_6000_1_-_ubuntu
262+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_urpinputsystem_-_6000_2_-_ubuntu
263+
- path: .yamato/project-test.yml#test_project_-_cinemachine_-_urpinputsystem_-_6000_3_-_ubuntu
264+
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_2022_3_-_ubuntu
232265
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_ubuntu
233-
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_0_-_windows
234-
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_1_-_macos
235266
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_1_-_ubuntu
236-
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_1_-_windows
237-
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_2_-_macos
238267
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_2_-_ubuntu
239-
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_2_-_windows
240-
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_macos
241268
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_ubuntu
242-
- path: .yamato/wrench/validation-jobs.yml#validate_-_cinemachine_-_6000_3_-_windows
243269
triggers:
244-
branches:
245-
only:
246-
- main
247-
- release[/]\\d+[.]\\d+)
270+
expression: NOT pull_request.draft
271+
cancel_old_ci: true
272+
cancel_leftover_jobs: Always
248273

‎Tools/Cinemachine-Recipes/Recipes/Triggers.cs‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using RecipeEngine.Api.Recipes;
55
using RecipeEngine.Modules.Wrench.Models;
66
using Unity.Yamato.JobDefinition;
7+
using CancelLeftoverJobs = RecipeEngine.Api.Triggers.CancelLeftoverJobs;
78
using Dependency = RecipeEngine.Api.Dependencies.Dependency;
89

910
namespace Cinemachine.Cookbook.Recipes;
@@ -12,6 +13,7 @@ public class Triggers : RecipeBase
1213
{
1314
private readonly CinemachineSettings config = new ();
1415
private const string packageName = "com.unity.cinemachine";
16+
private const string branchName = "main";
1517

1618
protected override ISet<Job> LoadJobs()
1719
=> Combine.Collections(GetTriggers()).SelectJobs();
@@ -22,28 +24,33 @@ private ISet<IJobBuilder> GetTriggers()
2224
var validationTests = config.Wrench.WrenchJobs[packageName][JobTypes.Validation];
2325
var projectTests = new ProjectTest().AsDependencies();
2426
var codeCoverage = new CodeCoverage().AsDependencies();
27+
2528
builders.Add(JobBuilder.Create($"Nightly Trigger")
2629
.WithDependencies(projectTests)
2730
.WithDependencies(validationTests)
2831
.WithDescription("Nightly check on main")
29-
3032
);
33+
3134
builders.Add(JobBuilder.Create($"All Trigger")
3235
.WithDependencies(projectTests)
3336
.WithDependencies(validationTests)
3437
.WithDependencies(codeCoverage)
35-
.WithPullRequestTrigger(pr => pr.ExcludeDraft())
36-
.WithDescription("All tests defined in recipes.")
38+
.WithBranchesTrigger(b => b.Only(branchName, "release[/]\\\\d+[.]\\\\d+)"))
39+
.WithDescription("All tests defined in recipes. Run in changes to mainline and release branches.")
3740
);
3841

39-
var prsubset = config.Wrench.WrenchJobs[packageName][JobTypes.Validation].Where(job => job.JobId.Contains("windows") || job.JobId.Contains("6000"));
42+
var prProjectTests = projectTests.Where(job => job.JobId.Contains("Ubuntu"));
43+
var prValidationTests = config.Wrench.WrenchJobs[packageName][JobTypes.Validation].Where(job => job.JobId.Contains("ubuntu"));
4044

41-
builders.Add(JobBuilder.Create("Package CI")
42-
.WithDependencies(prsubset)
43-
.WithPullRequestTrigger(pr => pr.ExcludeDraft())
44-
.WithBranchesTrigger(b => b.Only("main", "release[/]\\\\d+[.]\\\\d+)"))
45-
.WithDescription("Tests to run on PRs and mainline branches.")
45+
builders.Add(JobBuilder.Create("Pull Request Tests Trigger")
46+
.WithDependencies(prProjectTests)
47+
.WithDependencies(prValidationTests)
48+
.WithDependencies(codeCoverage)
49+
.WithPullRequestTrigger(pr => pr.ExcludeDraft(),
50+
true, CancelLeftoverJobs.Always)
51+
.WithDescription("Tests to run on PRs.")
4652
);
53+
4754
return builders;
4855
}
4956
}

0 commit comments

Comments
 (0)