From 88704a9f6d08139cad2ee6789bfb3c8267e8db36 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 6 Mar 2026 22:13:33 +0000 Subject: [PATCH 1/2] eval/nixpkgs: automatically label musl PRs --- ofborg/src/tasks/eval/nixpkgs.rs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ofborg/src/tasks/eval/nixpkgs.rs b/ofborg/src/tasks/eval/nixpkgs.rs index 8f0fd7d7..3ef1f425 100644 --- a/ofborg/src/tasks/eval/nixpkgs.rs +++ b/ofborg/src/tasks/eval/nixpkgs.rs @@ -13,11 +13,12 @@ use hubcaps::issues::IssueRef; use regex::Regex; use uuid::Uuid; -const TITLE_LABELS: [(&str, &str); 4] = [ +const TITLE_LABELS: [(&str, &str); 5] = [ ("bsd", "6.topic: bsd"), ("darwin", "6.topic: darwin"), ("macos", "6.topic: darwin"), ("cross", "6.topic: cross-compilation"), + ("musl", "6.topic: musl"), ]; fn label_from_title(title: &str) -> Vec { @@ -271,5 +272,9 @@ mod tests { label_from_title("pkg: fix cross-compilation"), vec![String::from("6.topic: cross-compilation")] ); + assert_eq!( + label_from_title("pkg: fix musl"), + vec![String::from("6.topic: musl")] + ); } } From 68014ddc0ccbf5e5cafa0261eb32134c7db5dd09 Mon Sep 17 00:00:00 2001 From: Colin Date: Fri, 6 Mar 2026 22:18:20 +0000 Subject: [PATCH 2/2] eval/nixpkgs: consider `pkgsCross` and `pkgsMusl` when labeling --- ofborg/src/tasks/eval/nixpkgs.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/ofborg/src/tasks/eval/nixpkgs.rs b/ofborg/src/tasks/eval/nixpkgs.rs index 3ef1f425..6424c98f 100644 --- a/ofborg/src/tasks/eval/nixpkgs.rs +++ b/ofborg/src/tasks/eval/nixpkgs.rs @@ -17,8 +17,8 @@ const TITLE_LABELS: [(&str, &str); 5] = [ ("bsd", "6.topic: bsd"), ("darwin", "6.topic: darwin"), ("macos", "6.topic: darwin"), - ("cross", "6.topic: cross-compilation"), - ("musl", "6.topic: musl"), + ("cross|pkgsCross", "6.topic: cross-compilation"), + ("musl|pkgsMusl", "6.topic: musl"), ]; fn label_from_title(title: &str) -> Vec { @@ -272,9 +272,17 @@ mod tests { label_from_title("pkg: fix cross-compilation"), vec![String::from("6.topic: cross-compilation")] ); + assert_eq!( + label_from_title("haskellPackages: fix some pkgsCross.ghcjs packages"), + vec![String::from("6.topic: cross-compilation")] + ); assert_eq!( label_from_title("pkg: fix musl"), vec![String::from("6.topic: musl")] ); + assert_eq!( + label_from_title("pkgsMusl.attr-path: fix build"), + vec![String::from("6.topic: musl")] + ); } }