11
11
import json
12
12
import logging
13
13
import os
14
+ import re
14
15
import typing
15
16
from pathlib import Path
16
17
from typing import List , Dict , Any , Optional
@@ -67,6 +68,23 @@ class GitHubCtx:
67
68
event_name : str
68
69
ref : str
69
70
repository : str
71
+ commit_message : Optional [str ]
72
+
73
+
74
+ def get_custom_jobs (ctx : GitHubCtx ) -> List [str ]:
75
+ """
76
+ Tries to parse names of specific CI jobs that should be executed in the form of
77
+ ci-job: <job-name>
78
+ from the commit message of the passed GitHub context.
79
+ """
80
+ if ctx .commit_message is None :
81
+ return []
82
+
83
+ regex = re .compile (r"ci-job: (.*)" )
84
+ jobs = []
85
+ for match in regex .finditer (ctx .commit_message ):
86
+ jobs .append (match .group (1 ))
87
+ return jobs
70
88
71
89
72
90
def find_run_type (ctx : GitHubCtx ) -> Optional [WorkflowRunType ]:
@@ -84,7 +102,8 @@ def find_run_type(ctx: GitHubCtx) -> Optional[WorkflowRunType]:
84
102
try_build = old_bors_try_build or new_bors_try_build
85
103
86
104
if try_build :
87
- return TryRunType ()
105
+ jobs = get_custom_jobs (ctx )
106
+ return TryRunType (custom_jobs = jobs )
88
107
89
108
if ctx .ref == "refs/heads/auto" and ctx .repository == "rust-lang-ci/rust" :
90
109
return AutoRunType ()
@@ -96,8 +115,24 @@ def calculate_jobs(run_type: WorkflowRunType, job_data: Dict[str, Any]) -> List[
96
115
if isinstance (run_type , PRRunType ):
97
116
return add_base_env (name_jobs (job_data ["pr" ], "PR" ), job_data ["envs" ]["pr" ])
98
117
elif isinstance (run_type , TryRunType ):
99
- return add_base_env (name_jobs (job_data ["try" ], "try" ), job_data ["envs" ]["try" ])
100
- elif isinstance (run_type , AutoRunType ):
118
+ jobs = job_data ["try" ]
119
+ custom_jobs = run_type .custom_jobs
120
+ if custom_jobs :
121
+ if len (custom_jobs ) > 10 :
122
+ raise Exception (
123
+ f"It is only possible to schedule up to 10 custom jobs,"
124
+ f"received { len (custom_jobs )} jobs"
125
+ )
126
+
127
+ jobs = []
128
+ for custom_job in custom_jobs :
129
+ job = [j for j in job_data ["auto" ] if j ["image" ] == custom_job ]
130
+ if not job :
131
+ raise Exception (f"Custom job `{ custom_job } ` not found in auto jobs" )
132
+ jobs .append (job [0 ])
133
+
134
+ return add_base_env (name_jobs (jobs , "try" ), job_data ["envs" ]["try" ])
135
+ elif run_type is AutoRunType :
101
136
return add_base_env (name_jobs (job_data ["auto" ], "auto" ), job_data ["envs" ]["auto" ])
102
137
103
138
return []
@@ -111,10 +146,16 @@ def skip_jobs(jobs: List[Dict[str, Any]], channel: str) -> List[Job]:
111
146
112
147
113
148
def get_github_ctx () -> GitHubCtx :
149
+ event_name = os .environ ["GITHUB_EVENT_NAME" ]
150
+
151
+ commit_message = None
152
+ if event_name == "push" :
153
+ commit_message = os .environ ["COMMIT_MESSAGE" ]
114
154
return GitHubCtx (
115
- event_name = os . environ [ "GITHUB_EVENT_NAME" ] ,
155
+ event_name = event_name ,
116
156
ref = os .environ ["GITHUB_REF" ],
117
- repository = os .environ ["GITHUB_REPOSITORY" ]
157
+ repository = os .environ ["GITHUB_REPOSITORY" ],
158
+ commit_message = commit_message
118
159
)
119
160
120
161
0 commit comments