Remove get_build_kind function

As we now store this data in the database.

Author: Kobzol

src/bors/handlers/mod.rs

@@ -22,7 +22,9 @@ use crate::bors::handlers::review::{
 use crate::bors::handlers::trybuild::{command_try_build, command_try_cancel};
 use crate::bors::handlers::workflow::{handle_workflow_completed, handle_workflow_started};
 use crate::bors::merge_queue::MergeQueueSender;
-use crate::bors::{BorsContext, CommandPrefix, Comment, RepositoryState};
+use crate::bors::{
+    AUTO_BRANCH_NAME, BorsContext, CommandPrefix, Comment, RepositoryState, TRY_BRANCH_NAME,
+};
 use crate::database::{DelegatedPermission, PullRequestModel};
 use crate::github::api::client::HideCommentReason;
 use crate::github::{GithubUser, LabelTrigger, PullRequest, PullRequestNumber};
@@ -674,6 +676,11 @@ async fn hide_try_build_started_comments(
     Ok(())
 }
 
+/// Is this branch interesting for the bot?
+fn is_bors_observed_branch(branch: &str) -> bool {
+    branch == TRY_BRANCH_NAME || branch == AUTO_BRANCH_NAME
+}
+
 #[cfg(test)]
 mod tests {
     use crate::tests::{BorsTester, Comment, User, default_repo_name, run_test};

src/bors/handlers/workflow.rs

@@ -3,10 +3,10 @@ use crate::bors::comment::{
     CommentTag, append_workflow_links_to_comment, build_failed_comment, try_build_succeeded_comment,
 };
 use crate::bors::event::{WorkflowRunCompleted, WorkflowRunStarted};
-use crate::bors::handlers::hide_try_build_started_comments;
 use crate::bors::handlers::labels::handle_label_trigger;
+use crate::bors::handlers::{hide_try_build_started_comments, is_bors_observed_branch};
 use crate::bors::merge_queue::MergeQueueSender;
-use crate::bors::{BuildKind, TRY_BRANCH_NAME, get_build_kind, is_bors_observed_branch};
+use crate::bors::{BuildKind, TRY_BRANCH_NAME};
 use crate::bors::{FailedWorkflowRun, RepositoryState, WorkflowRun};
 use crate::database::{
     BuildModel, BuildStatus, PullRequestModel, QueueStatus, WorkflowModel, WorkflowStatus,
@@ -167,10 +167,6 @@ async fn maybe_complete_build(
     merge_queue_tx: &MergeQueueSender,
     error_context: Option<String>,
 ) -> anyhow::Result<()> {
-    let Some(build_type) = get_build_kind(&payload.branch) else {
-        return Ok(());
-    };
-
     let Some(build) = db
         .find_build(
             &payload.repository,
@@ -252,7 +248,7 @@ async fn maybe_complete_build(
     } else {
         BuildStatus::Failure
     };
-    let trigger = match build_type {
+    let trigger = match build.kind {
         BuildKind::Try => {
             if !build_succeeded {
                 Some(LabelTrigger::TryBuildFailed)
@@ -289,7 +285,7 @@ async fn maybe_complete_build(
     }
 
     // Trigger merge queue when an auto build completes
-    if build_type == BuildKind::Auto {
+    if build.kind == BuildKind::Auto {
         merge_queue_tx.notify().await?;
     }
 
@@ -298,7 +294,7 @@ async fn maybe_complete_build(
     let comment_opt = if build_succeeded {
         tracing::info!("Build succeeded for PR {pr_num}");
 
-        if build_type == BuildKind::Try {
+        if build.kind == BuildKind::Try {
             Some(try_build_succeeded_comment(
                 &db_workflow_runs,
                 payload.commit_sha,
@@ -338,7 +334,7 @@ async fn maybe_complete_build(
         ))
     };
 
-    if build_type == BuildKind::Try {
+    if build.kind == BuildKind::Try {
         hide_try_build_started_comments(repo, db, &pr).await?;
     }
 

src/bors/mod.rs

@@ -239,19 +239,3 @@ pub fn create_merge_commit_message(pr: handlers::PullRequestData, merge_type: Me
     }
     message
 }
-
-/// Is this branch interesting for the bot?
-pub fn is_bors_observed_branch(branch: &str) -> bool {
-    branch == TRY_BRANCH_NAME || branch == AUTO_BRANCH_NAME
-}
-
-/// Get the build type based on the branch where it happened.
-pub fn get_build_kind(branch: &str) -> Option<BuildKind> {
-    if branch == TRY_BRANCH_NAME {
-        Some(BuildKind::Try)
-    } else if branch == AUTO_BRANCH_NAME {
-        Some(BuildKind::Auto)
-    } else {
-        None
-    }
-}