Fix issue with PR number extraction

Author: rylev

site/src/github.rs

@@ -84,6 +84,44 @@ pub async fn enqueue_unrolled_try_builds<'a>(
     Ok(mapping)
 }
 
+lazy_static::lazy_static! {
+    static ref ROLLUP_PR_NUMBER: regex::Regex =
+        regex::Regex::new(r#"^Auto merge of #(\d+)"#).unwrap();
+}
+
+// Gets the pr number for the associated rollup PR message. Returns None if this is not a rollup PR
+pub async fn rollup_pr(client: &client::Client, message: &str) -> Result<Option<u32>, String> {
+    if !message.starts_with("Auto merge of") {
+        return Ok(None);
+    }
+
+    let number = ROLLUP_PR_NUMBER
+        .captures(&message)
+        .and_then(|c| c.get(1))
+        .map(|m| {
+            println!("{}", m.as_str());
+            m.as_str().parse::<u64>()
+        })
+        .transpose()
+        .map_err(|e| format!("Error parsing PR number from '{message}': {e:?}"))?;
+
+    let number = match number {
+        Some(n) => n,
+        None => return Ok(None),
+    };
+
+    let issue = client
+        .get_issue(number)
+        .await
+        .map_err(|e| format!("Error fetching PR #{number} {e:?}"))?;
+
+    Ok(issue
+        .labels
+        .iter()
+        .any(|l| l.name == "rollup")
+        .then(|| issue.number))
+}
+
 // Returns the PR number
 pub async fn pr_and_try_for_rollup(
     ctxt: Arc<SiteCtxt>,

site/src/request_handlers/github.rs

@@ -1,7 +1,7 @@
 use crate::api::{github, ServerResult};
 use crate::github::{
     branch_for_rollup, client, enqueue_sha, enqueue_unrolled_try_builds, get_authorized_users,
-    parse_homu_comment, pr_and_try_for_rollup,
+    parse_homu_comment, pr_and_try_for_rollup, rollup_pr,
 };
 use crate::load::SiteCtxt;
 
@@ -44,10 +44,10 @@ async fn handle_push(ctxt: Arc<SiteCtxt>, push: github::Push) -> ServerResult<gi
         &ctxt,
         "https://api.github.com/repos/rust-lang/rust".to_owned(),
     );
-    if push.r#ref != "refs/heads/master" {
+    if push.r#ref != "refs/heads/master" || push.sender.login != "bors" {
         return Ok(github::Response);
     }
-    let rollup_pr = rollup_pr(&main_repo_client, &push).await?;
+    let rollup_pr = rollup_pr(&main_repo_client, &push.head_commit.message).await?;
     let rollup_pr = match rollup_pr {
         Some(pr) => pr,
         None => return Ok(github::Response),
@@ -68,7 +68,7 @@ async fn handle_push(ctxt: Arc<SiteCtxt>, push: github::Push) -> ServerResult<gi
         .map(|(rollup_merge, sha)| {
             ROLLUPED_PR_NUMBER
                 .captures(&rollup_merge.message)
-                .and_then(|c| c.get(0))
+                .and_then(|c| c.get(1))
                 .map(|m| (m.as_str(), sha))
                 .ok_or_else(|| {
                     format!(
@@ -90,37 +90,6 @@ async fn handle_push(ctxt: Arc<SiteCtxt>, push: github::Push) -> ServerResult<gi
     Ok(github::Response)
 }
 
-// Gets the pr number for the associated rollup PR. Returns None if this is not a rollup PR
-async fn rollup_pr(client: &client::Client, push: &github::Push) -> ServerResult<Option<u32>> {
-    macro_rules! get {
-        ($x:expr) => {
-            match $x {
-                Some(x) => x,
-                None => return Ok(None),
-            }
-        };
-    }
-    let is_bors =
-        push.sender.login == "bors" && push.head_commit.message.starts_with("Auto merge of");
-
-    if !is_bors {
-        return Ok(None);
-    }
-    let captures = get!(ROLLUP_PR_NUMBER.captures(&push.head_commit.message));
-    let number = get!(get!(captures.get(0)).as_str().parse::<u64>().ok());
-
-    let issue = client
-        .get_issue(number)
-        .await
-        .map_err(|e| format!("Error fetching PR #{number} {e:?}"))?;
-
-    Ok(issue
-        .labels
-        .iter()
-        .any(|l| l.name == "rollup")
-        .then(|| issue.number))
-}
-
 async fn handle_issue(
     ctxt: Arc<SiteCtxt>,
     issue: github::Issue,