feat: add option to wait for ci on approval

Author: Sakib25800

src/bors/comment.rs

@@ -70,6 +70,10 @@ pub fn unclean_try_build_cancelled_comment() -> Comment {
     )
 }
 
+pub fn unapproved_pr_comment() -> Comment {
+    Comment::new(":x: CI checks failed, removing approval.".to_string())
+}
+
 pub fn try_build_cancelled_comment(workflow_urls: impl Iterator<Item = String>) -> Comment {
     let mut try_build_cancelled_comment = r#"Try build cancelled.
 Cancelled workflows:"#

src/bors/handlers/review.rs

@@ -4,6 +4,7 @@ use crate::bors::command::Approver;
 use crate::bors::event::PullRequestEdited;
 use crate::bors::event::PullRequestPushed;
 use crate::bors::handlers::labels::handle_label_trigger;
+use crate::bors::CheckSuiteStatus;
 use crate::bors::Comment;
 use crate::bors::RepositoryState;
 use crate::github::CommitSha;
@@ -24,14 +25,43 @@ pub(super) async fn command_approve(
     approver: &Approver,
 ) -> anyhow::Result<()> {
     tracing::info!("Approving PR {}", pr.number);
+
     if !sufficient_approve_permission(repo_state.clone(), author) {
         deny_approve_request(&repo_state, pr, author).await?;
         return Ok(());
     };
+
     let approver = match approver {
         Approver::Myself => author.username.clone(),
         Approver::Specified(approver) => approver.clone(),
     };
+
+    if repo_state.config.load().wait_on_ci_approval {
+        // Get all the check suites for the PR.
+        let checks = repo_state
+            .client
+            .get_check_suites_for_commit(&pr.head.name, &pr.head.sha)
+            .await?;
+
+        // Check suite failed, don't approve.
+        if checks
+            .iter()
+            .any(|check| matches!(check.status, CheckSuiteStatus::Failure))
+        {
+            notify_of_rejected_approval(&repo_state, pr.number).await?;
+            return Ok(());
+        }
+
+        // Check suite still running, notify user.
+        if checks
+            .iter()
+            .any(|check| matches!(check.status, CheckSuiteStatus::Pending))
+        {
+            notify_of_pending_approval(&repo_state, pr.number).await?;
+            return Ok(());
+        }
+    }
+
     db.approve(repo_state.repository(), pr.number, approver.as_str())
         .await?;
     handle_label_trigger(&repo_state, pr.number, LabelTrigger::Approved).await?;
@@ -191,7 +221,7 @@ async fn notify_of_edited_pr(
         .post_comment(
             pr_number,
             Comment::new(format!(
-                r#":warning: The base branch changed to `{base_name}`, and the 
+                r#":warning: The base branch changed to `{base_name}`, and the
 PR will need to be re-approved."#,
             )),
         )
@@ -207,14 +237,40 @@ async fn notify_of_pushed_pr(
         .post_comment(
             pr_number,
             Comment::new(format!(
-                r#":warning: A new commit `{}` was pushed to the branch, the 
+                r#":warning: A new commit `{}` was pushed to the branch, the
 PR will need to be re-approved."#,
                 head_sha
             )),
         )
         .await
 }
 
+async fn notify_of_rejected_approval(
+    repo: &RepositoryState,
+    pr_number: PullRequestNumber,
+) -> anyhow::Result<()> {
+    repo.client
+        .post_comment(
+            pr_number,
+            Comment::new(format!(":x: Approval rejected, CI checks have failed.")),
+        )
+        .await
+}
+
+async fn notify_of_pending_approval(
+    repo: &RepositoryState,
+    pr_number: PullRequestNumber,
+) -> anyhow::Result<()> {
+    repo.client
+        .post_comment(
+            pr_number,
+            Comment::new(format!(
+                ":hourglass_flowing_sand: Waiting for CI checks to complete before approving..."
+            )),
+        )
+        .await
+}
+
 #[cfg(test)]
 mod tests {
     use crate::{
@@ -348,7 +404,7 @@ mod tests {
 
                 assert_eq!(
                     tester.get_comment().await?,
-                    r#":warning: The base branch changed to `main`, and the 
+                    r#":warning: The base branch changed to `main`, and the
 PR will need to be re-approved."#,
                 );
                 check_pr_unapproved(&tester, default_pr_number().into()).await;
@@ -428,7 +484,7 @@ PR will need to be re-approved."#,
                 assert_eq!(
                     tester.get_comment().await?,
                     format!(
-                        r#":warning: A new commit `pr-{}-sha` was pushed to the branch, the 
+                        r#":warning: A new commit `pr-{}-sha` was pushed to the branch, the
 PR will need to be re-approved."#,
                         default_pr_number()
                     )

src/bors/handlers/workflow.rs

@@ -1,7 +1,9 @@
 use std::sync::Arc;
 use std::time::Duration;
 
-use crate::bors::comment::{try_build_succeeded_comment, workflow_failed_comment};
+use crate::bors::comment::{
+    try_build_succeeded_comment, unapproved_pr_comment, workflow_failed_comment,
+};
 use crate::bors::event::{CheckSuiteCompleted, WorkflowCompleted, WorkflowStarted};
 use crate::bors::handlers::is_bors_observed_branch;
 use crate::bors::handlers::labels::handle_label_trigger;
@@ -169,6 +171,22 @@ async fn try_complete_build(
         .iter()
         .any(|check| matches!(check.status, CheckSuiteStatus::Failure));
 
+    // Check suite failed, unapprove PR.
+    if repo.config.load().wait_on_ci_approval && pr.approved_by.is_some() && has_failure {
+        tracing::info!(
+            "Unapproving PR {} due to CI failure on commit {}",
+            pr.number,
+            payload.commit_sha
+        );
+
+        db.unapprove(repo.repository(), pr.number).await?;
+        handle_label_trigger(repo, pr.number, LabelTrigger::Unapproved).await?;
+
+        repo.client
+            .post_comment(pr.number, unapproved_pr_comment())
+            .await?;
+    }
+
     let mut workflows = db.get_workflows_for_build(&build).await?;
     workflows.sort_by(|a, b| a.name.cmp(&b.name));
 

src/config.rs

@@ -21,12 +21,18 @@ pub struct RepositoryConfig {
     pub labels: HashMap<LabelTrigger, Vec<LabelModification>>,
     #[serde(default, deserialize_with = "deserialize_duration_from_secs_opt")]
     pub min_ci_time: Option<Duration>,
+    #[serde(default = "default_wait_on_ci_approval")]
+    pub wait_on_ci_approval: bool,
 }
 
 fn default_timeout() -> Duration {
     Duration::from_secs(3600)
 }
 
+fn default_wait_on_ci_approval() -> bool {
+    true
+}
+
 fn deserialize_duration_from_secs_opt<'de, D>(deserializer: D) -> Result<Option<Duration>, D::Error>
 where
     D: Deserializer<'de>,