Hide previous auto build started comments when an auto build finishes

Author: Kobzol

src/bors/handlers/mod.rs

@@ -658,14 +658,15 @@ async fn unapprove_pr(
     handle_label_trigger(repo_state, pr.number, LabelTrigger::Unapproved).await
 }
 
-/// Hide all previous "Try build started" comments on the given PR.
-async fn hide_try_build_started_comments(
+/// Hide all previous "Try/auto build started" comments on the given PR.
+async fn hide_build_started_comments(
     repo: &RepositoryState,
     db: &PgDbClient,
     pr: &PullRequestModel,
+    tag: CommentTag,
 ) -> anyhow::Result<()> {
     let outdated = db
-        .get_tagged_bot_comments(repo.repository(), pr.number, CommentTag::TryBuildStarted)
+        .get_tagged_bot_comments(repo.repository(), pr.number, tag)
         .await?;
     for comment in outdated {
         repo.client

src/bors/handlers/trybuild.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use super::{PullRequestData, deny_request};
-use super::{has_permission, hide_try_build_started_comments};
+use super::{has_permission, hide_build_started_comments};
 use crate::PgDbClient;
 use crate::bors::command::{CommandPrefix, Parent};
 use crate::bors::comment::try_build_cancelled_comment;
@@ -73,7 +73,9 @@ pub(super) async fn command_try_build(
     let cancelled_workflow_urls = if let Some(build) = get_pending_build(pr.db) {
         let res = cancel_previous_try_build(repo, &db, build).await?;
         // Also try to hide previous "Try build started" comments that weren't hidden yet
-        if let Err(error) = hide_try_build_started_comments(repo, &db, pr.db).await {
+        if let Err(error) =
+            hide_build_started_comments(repo, &db, pr.db, CommentTag::TryBuildStarted).await
+        {
             tracing::error!("Failed to hide previous try build started comment(s): {error:?}");
         }
 

src/bors/handlers/workflow.rs

@@ -5,7 +5,7 @@ use crate::bors::comment::{
 };
 use crate::bors::event::{WorkflowRunCompleted, WorkflowRunStarted};
 use crate::bors::handlers::labels::handle_label_trigger;
-use crate::bors::handlers::{hide_try_build_started_comments, is_bors_observed_branch};
+use crate::bors::handlers::{hide_build_started_comments, is_bors_observed_branch};
 use crate::bors::merge_queue::MergeQueueSender;
 use crate::bors::{FailedWorkflowRun, RepositoryState, WorkflowRun};
 use crate::database::{
@@ -337,9 +337,11 @@ async fn maybe_complete_build(
         ))
     };
 
-    if build.kind == BuildKind::Try {
-        hide_try_build_started_comments(repo, db, &pr).await?;
-    }
+    let tag = match build.kind {
+        BuildKind::Try => CommentTag::TryBuildStarted,
+        BuildKind::Auto => CommentTag::AutoBuildStarted,
+    };
+    hide_build_started_comments(repo, db, &pr, tag).await?;
 
     if let Some(comment) = comment_opt {
         repo.client.post_comment(pr_num, comment).await?;

src/bors/merge_queue.rs

@@ -491,6 +491,7 @@ pub fn start_merge_queue(
 mod tests {
     use octocrab::params::checks::{CheckRunConclusion, CheckRunStatus};
 
+    use crate::github::api::client::HideCommentReason;
     use crate::tests::{BorsBuilder, GitHubState, run_test};
     use crate::{
         bors::{
@@ -1173,4 +1174,24 @@ auto_build_failed = ["+foo", "+bar", "-baz"]
         })
         .await;
     }
+
+    #[sqlx::test]
+    async fn hide_auto_build_started_comment_after_workflow_finish(pool: sqlx::PgPool) {
+        run_test(pool, async |tester: &mut BorsTester| {
+            tester.approve(()).await?;
+            tester.process_merge_queue().await;
+            let comment = tester.get_next_comment(()).await?;
+
+            tester
+                .workflow_full_failure(tester.auto_branch().await)
+                .await?;
+            tester.expect_comments((), 1).await;
+            tester
+                .expect_hidden_comment(&comment, HideCommentReason::Outdated)
+                .await;
+
+            Ok(())
+        })
+        .await;
+    }
 }