diff --git a/src/main.rs b/src/main.rs index d8bd3b5..3a512a8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -53,10 +53,8 @@ async fn main_inner() -> Result<()> { ) .await?; - let notification_repo = format!("https://github.com/{github_owner}/{github_repo}"); - let builder = build::background_builder(db.clone(), github_client); - let server = web::webserver(db, notification_repo); + let server = web::webserver(db); tokio::select! { result = builder => { diff --git a/src/notification.rs b/src/notification.rs index 9eb5636..7d4c449 100644 --- a/src/notification.rs +++ b/src/notification.rs @@ -7,24 +7,7 @@ use crate::db::{Db, FullBuildInfo, NotificationIssue, NotificationStatus, Status pub const TABLE_FILE: &str = file!(); pub const TABLE_LINE: u32 = line!() + 1; -const TARGET_NOTIFICATIONS: &[(&str, &[&str])] = &[ - ("aarch64-unknown-linux-musl", &["Gelbpunkt", "famfo"]), - ( - "aarch64_be-unknown-linux-musl", - &["Gelbpunkt", "neuschaefer"], - ), - ("aarch64_be-unknown-none-softfloat", &["Gelbpunkt"]), - ("armv7-sony-vita-newlibeabihf", &["pheki"]), - ("mips64-unknown-linux-muslabi64", &["Gelbpunkt"]), - ( - "powerpc64-unknown-linux-musl", - &["Gelbpunkt", "famfo", "neuschaefer"], - ), - ( - "powerpc64le-unknown-linux-musl", - &["Gelbpunkt", "famfo", "neuschaefer"], - ), -]; +const TARGET_NOTIFICATIONS: &[(&str, &[&str])] = &[("armv7-sony-vita-newlibeabihf", &["pheki"])]; pub fn notification_pr_url() -> String { format!("https://github.com/Noratrieb/does-it-build/blob/main/{TABLE_FILE}#L{TABLE_LINE}") diff --git a/src/web.rs b/src/web.rs index a667a51..fdb5f37 100644 --- a/src/web.rs +++ b/src/web.rs @@ -19,10 +19,9 @@ use crate::{ #[derive(Clone)] pub struct AppState { pub db: Db, - notification_repo: String, } -pub async fn webserver(db: Db, notification_repo: String) -> Result<()> { +pub async fn webserver(db: Db) -> Result<()> { let app = Router::new() .route("/", get(web_root)) .route("/build", get(web_build)) @@ -30,10 +29,7 @@ pub async fn webserver(db: Db, notification_repo: String) -> Result<()> { .route("/nightly", get(web_nightly)) .route("/index.css", get(index_css)) .route("/index.js", get(index_js)) - .with_state(AppState { - db, - notification_repo, - }); + .with_state(AppState { db }); info!("Serving website on port 3000 (commit {})", crate::VERSION); @@ -84,7 +80,6 @@ async fn web_build(State(state): State, Query(query): Query, build_duration_s: Option, - notification_pr_url: String, does_it_build_version: Option, } @@ -114,7 +109,6 @@ async fn web_build(State(state): State, Query(query): Query, Query(query): Query, - open_notification_issue_number: Option, - notification_repo: String, } let filter_failures = query.failures.unwrap_or(false); @@ -184,14 +176,6 @@ async fn web_target(State(state): State, Query(query): Query, Query(query): Query{{target}} ({{mode}}) Home -

- 🔔 does-it-build supports sending notifications to target maintainers via - GitHub issues. You can add yourself with - a PR. 🔔 -

{{status}}
{% if let Some(rustflags) = rustflags %}

diff --git a/templates/nightly.html b/templates/nightly.html index cc5d5f1..3207c90 100644 --- a/templates/nightly.html +++ b/templates/nightly.html @@ -52,11 +52,8 @@ {{ build.0 }} {% match build.2 %} {% when Some with (build) %} - - - {{ build.status.to_emoji() }} - - [details] + + {{ build.status.to_emoji() }} {% when None %} diff --git a/templates/target.html b/templates/target.html index 6df13d5..c5678ce 100644 --- a/templates/target.html +++ b/templates/target.html @@ -1,4 +1,4 @@ - + @@ -38,12 +38,6 @@ {% endfor %}

{% endif %} - {% if let Some(issue) = open_notification_issue_number %} -

- There is currently an open issue with a maintainer ping: - {{notification_repo}}/issues/{{issue}} -

- {% endif %} {% if showing_failures %}

show all @@ -63,11 +57,8 @@ {{ build.0 }} {% match build.2 %} {% when Some with (build) %} - - - {{ build.status.to_emoji() }} - - [details] + + {{ build.status.to_emoji() }} {% when None %}