Deal with auto build push error

Author: Sakib25800

src/bors/comment.rs

@@ -300,3 +300,9 @@ pub fn auto_build_succeeded_comment(
         ":sunny: Test successful - {urls}\nApproved by: `{approved_by}`\nPushing {merge_sha} to `{base_ref}`...",
     ))
 }
+
+pub fn auto_build_push_failed_comment(error: &str) -> Comment {
+    Comment::new(format!(
+        ":eyes: Test was successful, but fast-forwarding failed: {error}"
+    ))
+}

src/bors/merge_queue.rs

@@ -1,12 +1,15 @@
 use anyhow::anyhow;
-use octocrab::params::checks::{CheckRunOutput, CheckRunStatus};
+use octocrab::models::CheckRunId;
+use octocrab::params::checks::{CheckRunConclusion, CheckRunOutput, CheckRunStatus};
 use std::future::Future;
 use std::sync::Arc;
 use tokio::sync::mpsc;
 use tracing::Instrument;
 
 use crate::BorsContext;
-use crate::bors::comment::{auto_build_started_comment, auto_build_succeeded_comment};
+use crate::bors::comment::{
+    auto_build_push_failed_comment, auto_build_started_comment, auto_build_succeeded_comment,
+};
 use crate::bors::{PullRequestStatus, RepositoryState};
 use crate::database::{BuildStatus, PullRequestModel};
 use crate::github::api::client::GithubRepositoryClient;
@@ -114,7 +117,36 @@ pub async fn merge_queue_tick(ctx: Arc<BorsContext>) -> anyhow::Result<()> {
                                     )
                                     .await?;
                             }
-                            Err(_) => {}
+                            Err(error) => {
+                                tracing::error!(
+                                    "Failed to push PR {pr_num} to base branch: {:?}",
+                                    error
+                                );
+
+                                if let Some(check_run_id) = auto_build.check_run_id {
+                                    if let Err(error) = repo
+                                        .client
+                                        .update_check_run(
+                                            CheckRunId(check_run_id as u64),
+                                            CheckRunStatus::Completed,
+                                            Some(CheckRunConclusion::Failure),
+                                            None,
+                                        )
+                                        .await
+                                    {
+                                        tracing::error!(
+                                            "Could not update check run {check_run_id}: {error:?}"
+                                        );
+                                    }
+                                }
+
+                                ctx.db
+                                    .update_build_status(auto_build, BuildStatus::Failure)
+                                    .await?;
+
+                                let comment = auto_build_push_failed_comment(&error.to_string());
+                                repo.client.post_comment(pr.number, comment).await?;
+                            }
                         };
 
                         // Break to give GitHub time to update the base branch.
@@ -315,7 +347,7 @@ pub fn start_merge_queue(ctx: Arc<BorsContext>) -> (MergeQueueSender, impl Futur
 #[cfg(test)]
 mod tests {
 
-    use octocrab::params::checks::CheckRunStatus;
+    use octocrab::params::checks::{CheckRunConclusion, CheckRunStatus};
     use sqlx::PgPool;
 
     use crate::{
@@ -462,6 +494,69 @@ mod tests {
         .await;
     }
 
+    #[sqlx::test]
+    async fn auto_build_push_fail_comment(pool: sqlx::PgPool) {
+        run_merge_queue_test(pool, async |mut tester| {
+            start_auto_build(&mut tester).await?;
+            tester.workflow_full_success(tester.auto_branch()).await?;
+            tester.expect_comments(1).await;
+
+            tester.default_repo().lock().push_error = true;
+
+            tester.process_merge_queue().await;
+            insta::assert_snapshot!(
+                tester.get_comment().await?,
+                @":eyes: Test was successful, but fast-forwarding failed: IO error"
+            );
+            Ok(())
+        })
+        .await;
+    }
+
+    #[sqlx::test]
+    async fn auto_build_push_fail_updates_check_run(pool: sqlx::PgPool) {
+        run_merge_queue_test(pool, async |mut tester| {
+            start_auto_build(&mut tester).await?;
+            tester.workflow_full_success(tester.auto_branch()).await?;
+            tester.expect_comments(1).await;
+
+            tester.default_repo().lock().push_error = true;
+
+            tester.process_merge_queue().await;
+            tester.expect_comments(1).await;
+            tester.expect_check_run(
+                &tester.default_pr().await.get_gh_pr().head_sha,
+                AUTO_BUILD_CHECK_RUN_NAME,
+                AUTO_BUILD_CHECK_RUN_NAME,
+                CheckRunStatus::Completed,
+                Some(CheckRunConclusion::Failure),
+            );
+            Ok(())
+        })
+        .await;
+    }
+
+    #[sqlx::test]
+    async fn auto_build_push_fail_in_db(pool: sqlx::PgPool) {
+        run_merge_queue_test(pool, async |mut tester| {
+            start_auto_build(&mut tester).await?;
+            tester.workflow_full_success(tester.auto_branch()).await?;
+            tester.expect_comments(1).await;
+
+            tester.default_repo().lock().push_error = true;
+
+            tester.process_merge_queue().await;
+            tester.expect_comments(1).await;
+            tester
+                .wait_for_default_pr(|pr| {
+                    pr.auto_build.as_ref().unwrap().status == BuildStatus::Failure
+                })
+                .await?;
+            Ok(())
+        })
+        .await;
+    }
+
     #[sqlx::test]
     async fn auto_build_branch_history(pool: sqlx::PgPool) {
         let gh = run_merge_queue_test(pool, async |mut tester| {

src/tests/mocks/repository.rs

@@ -168,6 +168,8 @@ pub struct Repo {
     pub check_runs: Vec<CheckRunData>,
     /// Cause pull request fetch to fail.
     pub pull_request_error: bool,
+    // Cause branch push to fail.
+    pub push_error: bool,
     pub pr_push_counter: u64,
 }
 
@@ -184,6 +186,7 @@ impl Repo {
             workflow_cancel_error: false,
             workflow_runs: vec![],
             pull_request_error: false,
+            push_error: false,
             pr_push_counter: 0,
             check_runs: vec![],
         }
@@ -509,6 +512,10 @@ async fn mock_update_branch(repo: Arc<Mutex<Repo>>, mock_server: &MockServer) {
 
             let data: SetRefRequest = req.body_json().unwrap();
 
+            if repo.push_error {
+                return ResponseTemplate::new(500).set_body_string("Push error");
+            }
+
             let sha = data.sha;
             match repo.get_branch_by_name(branch_name) {
                 Some(branch) => {