Break after merge to give GH API time to update

Author: Sakib25800

src/bors/comment.rs

@@ -227,13 +227,3 @@ pub fn auto_build_push_failed_comment(error: &str) -> Comment {
         ":eyes: Test was successful, but fast-forwarding failed: {error}",
     ))
 }
-
-pub fn auto_build_base_moved_comment(
-    base_ref: &str,
-    old_base: &CommitSha,
-    new_base: &CommitSha,
-) -> Comment {
-    Comment::new(format!(
-        ":warning: Auto build outdated due to push to {base_ref} ({old_base} → {new_base}). Auto build will be rebuilt.",
-    ))
-}

src/bors/merge_queue.rs

@@ -8,8 +8,7 @@ use crate::{
     bors::{
         PullRequestStatus, RepositoryState,
         comment::{
-            auto_build_base_moved_comment, auto_build_push_failed_comment,
-            auto_build_started_comment, merge_conflict_comment,
+            auto_build_push_failed_comment, auto_build_started_comment, merge_conflict_comment,
         },
         handlers::labels::handle_label_trigger,
     },
@@ -85,55 +84,35 @@ pub async fn handle_merge_queue(ctx: Arc<BorsContext>) -> anyhow::Result<()> {
                                     .await?;
                             }
                             Err(error) => {
-                                let current_base_sha =
-                                    repo.client.get_branch_sha(&pr.base_branch).await?;
-                                let build_time_base_sha = CommitSha(auto_build.parent.clone());
-
-                                if current_base_sha != build_time_base_sha {
-                                    tracing::info!(
-                                        "Base branch has moved for PR {pr_num} (was: {}, now: {}). Deleting auto build.",
-                                        build_time_base_sha,
-                                        current_base_sha
-                                    );
-
-                                    let comment = auto_build_base_moved_comment(
-                                        &pr.base_branch,
-                                        &build_time_base_sha,
-                                        &current_base_sha,
-                                    );
-                                    repo.client.post_comment(pr.number, comment).await?;
-
-                                    ctx.db.delete_auto_build(&pr).await?;
-                                } else {
-                                    tracing::error!(
-                                        "Failed to push PR {pr_num} to base branch: {:?}",
-                                        error
-                                    );
-
-                                    let gh_pr = repo.client.get_pull_request(pr_num).await?;
-
-                                    let desc = format!(
-                                        "Test was successful, but fast-forwarding failed: {}",
-                                        &error.to_string()
-                                    );
-                                    repo.client
-                                        .create_commit_status(
-                                            &gh_pr.head.sha,
-                                            StatusState::Error,
-                                            None,
-                                            Some(&desc),
-                                            Some("bors"),
-                                        )
-                                        .await?;
-
-                                    let comment =
-                                        auto_build_push_failed_comment(&error.to_string());
-                                    repo.client.post_comment(pr.number, comment).await?;
-                                }
+                                tracing::error!(
+                                    "Failed to push PR {pr_num} to base branch: {:?}",
+                                    error
+                                );
+
+                                let gh_pr = repo.client.get_pull_request(pr_num).await?;
+
+                                let desc = format!(
+                                    "Test was successful, but fast-forwarding failed: {}",
+                                    &error.to_string()
+                                );
+                                repo.client
+                                    .create_commit_status(
+                                        &gh_pr.head.sha,
+                                        StatusState::Error,
+                                        None,
+                                        Some(&desc),
+                                        Some("bors"),
+                                    )
+                                    .await?;
+
+                                let comment = auto_build_push_failed_comment(&error.to_string());
+                                repo.client.post_comment(pr.number, comment).await?;
                             }
                         };
 
-                        continue;
+                        // We break rather than continue to give GitHub time to update the base
+                        // branch.
+                        break;
                     }
                     // Build in progress - stop queue. We can only have one PR built at a time.
                     BuildStatus::Pending => {