@@ -123,7 +123,7 @@ pub fn load_job_db(db: &str) -> anyhow::Result<JobDatabase> {
123123/// modulo certain carve-outs" in [`validate_job_database`].
124124///
125125/// This invariant is important to make sure that it's not easily possible (without modifying
126- /// `citool`) to have PRs with red PR-only CI jobs merged into `master `, causing all subsequent PR
126+ /// `citool`) to have PRs with red PR-only CI jobs merged into `main `, causing all subsequent PR
127127/// CI runs to be red until the cause is fixed.
128128fn register_pr_jobs_as_auto_jobs ( db : & mut JobDatabase ) -> anyhow:: Result < ( ) > {
129129 for pr_job in & db. pr_jobs {
@@ -273,7 +273,7 @@ pub enum RunType {
273273 /// Merge attempt workflow
274274 AutoJob ,
275275 /// Fake job only used for sharing Github Actions cache.
276- MasterJob ,
276+ MainJob ,
277277}
278278
279279/// Maximum number of custom try jobs that can be requested in a single
@@ -323,7 +323,7 @@ fn calculate_jobs(
323323 ( jobs, "try" , & db. envs . try_env )
324324 }
325325 RunType :: AutoJob => ( db. auto_jobs . clone ( ) , "auto" , & db. envs . auto_env ) ,
326- RunType :: MasterJob => return Ok ( vec ! [ ] ) ,
326+ RunType :: MainJob => return Ok ( vec ! [ ] ) ,
327327 } ;
328328 let jobs = substitute_github_vars ( jobs. clone ( ) )
329329 . context ( "Failed to substitute GitHub context variables in jobs" ) ?;
@@ -376,15 +376,15 @@ pub fn calculate_job_matrix(
376376 eprintln ! ( "Run type: {run_type:?}" ) ;
377377
378378 let jobs = calculate_jobs ( & run_type, & db, channel) ?;
379- if jobs. is_empty ( ) && !matches ! ( run_type, RunType :: MasterJob ) {
379+ if jobs. is_empty ( ) && !matches ! ( run_type, RunType :: MainJob ) {
380380 return Err ( anyhow:: anyhow!( "Computed job list is empty" ) ) ;
381381 }
382382
383383 let run_type = match run_type {
384384 RunType :: PullRequest => "pr" ,
385385 RunType :: TryJob { .. } => "try" ,
386386 RunType :: AutoJob => "auto" ,
387- RunType :: MasterJob => "master " ,
387+ RunType :: MainJob => "main " ,
388388 } ;
389389
390390 eprintln ! ( "Output" ) ;
0 commit comments