Rename master branch references to main

Author: reddevilmidzy

src/ci/citool/src/jobs.rs

@@ -123,7 +123,7 @@ pub fn load_job_db(db: &str) -> anyhow::Result<JobDatabase> {
 /// modulo certain carve-outs" in [`validate_job_database`].
 ///
 /// This invariant is important to make sure that it's not easily possible (without modifying
-/// `citool`) to have PRs with red PR-only CI jobs merged into `master`, causing all subsequent PR
+/// `citool`) to have PRs with red PR-only CI jobs merged into `main`, causing all subsequent PR
 /// CI runs to be red until the cause is fixed.
 fn register_pr_jobs_as_auto_jobs(db: &mut JobDatabase) -> anyhow::Result<()> {
     for pr_job in &db.pr_jobs {
@@ -273,7 +273,7 @@ pub enum RunType {
     /// Merge attempt workflow
     AutoJob,
     /// Fake job only used for sharing Github Actions cache.
-    MasterJob,
+    MainJob,
 }
 
 /// Maximum number of custom try jobs that can be requested in a single
@@ -323,7 +323,7 @@ fn calculate_jobs(
             (jobs, "try", &db.envs.try_env)
         }
         RunType::AutoJob => (db.auto_jobs.clone(), "auto", &db.envs.auto_env),
-        RunType::MasterJob => return Ok(vec![]),
+        RunType::MainJob => return Ok(vec![]),
     };
     let jobs = substitute_github_vars(jobs.clone())
         .context("Failed to substitute GitHub context variables in jobs")?;
@@ -376,15 +376,15 @@ pub fn calculate_job_matrix(
     eprintln!("Run type: {run_type:?}");
 
     let jobs = calculate_jobs(&run_type, &db, channel)?;
-    if jobs.is_empty() && !matches!(run_type, RunType::MasterJob) {
+    if jobs.is_empty() && !matches!(run_type, RunType::MainJob) {
         return Err(anyhow::anyhow!("Computed job list is empty"));
     }
 
     let run_type = match run_type {
         RunType::PullRequest => "pr",
         RunType::TryJob { .. } => "try",
         RunType::AutoJob => "auto",
-        RunType::MasterJob => "master",
+        RunType::MainJob => "main",
     };
 
     eprintln!("Output");

src/ci/citool/src/main.rs

@@ -47,7 +47,7 @@ impl GitHubContext {
                 Some(RunType::TryJob { job_patterns: patterns })
             }
             ("push", "refs/heads/auto") => Some(RunType::AutoJob),
-            ("push", "refs/heads/master") => Some(RunType::MasterJob),
+            ("push", "refs/heads/main") => Some(RunType::MainJob),
             _ => None,
         }
     }

src/ci/citool/tests/jobs.rs

@@ -46,11 +46,11 @@ fn pr_jobs() {
 }
 
 #[test]
-fn master_jobs() {
-    let stdout = get_matrix("push", "commit", "refs/heads/master");
+fn main_jobs() {
+    let stdout = get_matrix("push", "commit", "refs/heads/main");
     insta::assert_snapshot!(stdout, @r#"
     jobs=[]
-    run_type=master
+    run_type=main
     "#);
 }
 

src/ci/publish_toolstate.sh

@@ -34,8 +34,8 @@ for RETRY_COUNT in 1 2 3 4 5; do
     FAILURE=0
     git commit -a -F "$MESSAGE_FILE" || break
     # On failure randomly sleep for 0 to 3 seconds as a crude way to introduce jittering.
-    git push origin master && break || sleep $(LC_ALL=C tr -cd 0-3 < /dev/urandom | head -c 1)
+    git push origin main && break || sleep $(LC_ALL=C tr -cd 0-3 < /dev/urandom | head -c 1)
     FAILURE=1
-    git fetch origin master
-    git reset --hard origin/master
+    git fetch origin main
+    git reset --hard origin/main
 done