Skip to content

Do not require pushes to main to be triggered by bors #2364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Kobzol merged 1 commit into from
Jan 7, 2026
Merged

Do not require pushes to main to be triggered by bors #2364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions site/src/api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,6 @@ pub mod github {
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct Push {
pub r#ref: String,
pub sender: Sender,
pub head_commit: HeadCommit,
pub before: String,
pub commits: Vec<Commit>,
Expand All @@ -626,11 +625,6 @@ pub mod github {
pub message: String,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct Sender {
pub login: String,
}

#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct Response;
}
Expand Down
2 changes: 1 addition & 1 deletion site/src/request_handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mod status_page;

pub use bootstrap::handle_bootstrap;
pub use dashboard::handle_dashboard;
pub use github::handle_github;
pub use github::handle_github_webhook;
pub use graph::{
handle_compile_detail_graphs, handle_compile_detail_sections, handle_graphs,
handle_runtime_detail_graphs,
Expand Down
6 changes: 2 additions & 4 deletions site/src/request_handlers/github.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use database::{
use hashbrown::HashMap;
use std::sync::Arc;

pub async fn handle_github(
pub async fn handle_github_webhook(
request: github::Request,
ctxt: Arc<SiteCtxt>,
) -> ServerResult<github::Response> {
Expand All @@ -25,9 +25,7 @@ pub async fn handle_github(

async fn handle_push(ctxt: Arc<SiteCtxt>, push: github::Push) -> ServerResult<github::Response> {
let gh_client = client::Client::from_ctxt(&ctxt, RUST_REPO_GITHUB_API_URL.to_owned());
if push.r#ref != format!("refs/heads/{}", push.repository.default_branch)
|| push.sender.login != "bors"
{
if push.r#ref != format!("refs/heads/{}", push.repository.default_branch) {
return Ok(github::Response);
}
let rollup_pr_number = match rollup_pr_number(&gh_client, &push.head_commit.message).await? {
Expand Down
6 changes: 5 additions & 1 deletion site/src/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,11 @@ async fn serve_req(server: Server, req: Request) -> Result<Response, ServerError
};
match event.as_str() {
"issue_comment" | "push" => Ok(to_response(
request_handlers::handle_github(check!(parse_body(&body)), ctxt.clone()).await,
request_handlers::handle_github_webhook(
check!(parse_body(&body)),
ctxt.clone(),
)
.await,
&compression,
)),
_ => Ok(http::Response::builder()
Expand Down
Loading