Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/ofborg
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bb7ca7e6eac7
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9548a495d5f2
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Sep 26, 2019

  1. add label for exactly 1 rebuild 

    It is fundamentally different to review a leaf package with no other
reverse dependencies in Nixpkgs and one that has at least one reverse
dependency, so make those separate labels.
    @ryantm
    ryantm committed Sep 26, 2019
    Copy the full SHA
    88b2c5e View commit details

  2. fix "error: trait objects without an explicit dyn are deprecated"

    @ryantm
    ryantm committed Sep 26, 2019
    Copy the full SHA
    19e3433 View commit details

Commits on Oct 27, 2019

  1. fix formatting for pedantry check

    @ryantm
    ryantm committed Oct 27, 2019
    Copy the full SHA
    a278697 View commit details

Commits on Apr 2, 2020

  1. Merge pull request #395 from ryantm/leaf 

    add label for exactly 1 rebuild
    @grahamc
    grahamc authored Apr 2, 2020
    Copy the full SHA
    9548a49 View commit details
Showing with 43 additions and 3 deletions.
  1. +43 −3 ofborg/src/tagger.rs
46 changes: 43 additions & 3 deletions ofborg/src/tagger.rs
View file
Original file line number Diff line number Diff line change
@@ -121,6 +121,7 @@ impl Default for RebuildTagger {
RebuildTagger {
possible: vec![
String::from("10.rebuild-darwin: 0"),
String::from("10.rebuild-darwin: 1"),
String::from("10.rebuild-darwin: 1-10"),
String::from("10.rebuild-darwin: 11-100"),
String::from("10.rebuild-darwin: 101-500"),
@@ -130,6 +131,7 @@ impl Default for RebuildTagger {
String::from("10.rebuild-darwin: 2501-5000"),
String::from("10.rebuild-darwin: 5001+"),
String::from("10.rebuild-linux: 0"),
String::from("10.rebuild-linux: 1"),
String::from("10.rebuild-linux: 1-10"),
String::from("10.rebuild-linux: 11-100"),
String::from("10.rebuild-linux: 101-500"),
@@ -223,8 +225,10 @@ impl RebuildTagger {
&["101-500"]
} else if count > 10 {
&["11-100"]
} else if count > 0 {
} else if count > 1 {
&["1-10"]
} else if count > 0 {
&["1", "1-10"]
} else {
&["0"]
}
@@ -381,6 +385,7 @@ mod tests {
assert_eq!(
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-darwin: 11-100",
"10.rebuild-darwin: 101-500",
@@ -389,6 +394,7 @@ mod tests {
"10.rebuild-darwin: 1001-2500",
"10.rebuild-darwin: 2501-5000",
"10.rebuild-darwin: 5001+",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
"10.rebuild-linux: 11-100",
"10.rebuild-linux: 101-500",
@@ -405,11 +411,16 @@ mod tests {

assert_eq!(
tagger.tags_to_add(),
vec!["10.rebuild-darwin: 0", "10.rebuild-linux: 1-10",]
vec![
"10.rebuild-darwin: 0",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
]
);
assert_eq!(
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-darwin: 11-100",
"10.rebuild-darwin: 101-500",
@@ -433,7 +444,12 @@ mod tests {
tagger.parse_attrs(PackageArchSrc::linux(1).and_darwin(1).into());
assert_eq!(
tagger.tags_to_add(),
vec!["10.rebuild-darwin: 1-10", "10.rebuild-linux: 1-10",]
vec![
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
]
);
assert_eq!(
tagger.tags_to_remove(),
@@ -467,6 +483,7 @@ mod tests {
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 0",
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 11-100",
"10.rebuild-darwin: 101-500",
"10.rebuild-darwin: 501+",
@@ -475,6 +492,7 @@ mod tests {
"10.rebuild-darwin: 2501-5000",
"10.rebuild-darwin: 5001+",
"10.rebuild-linux: 0",
"10.rebuild-linux: 1",
"10.rebuild-linux: 11-100",
"10.rebuild-linux: 101-500",
"10.rebuild-linux: 501+",
@@ -495,6 +513,7 @@ mod tests {
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 0",
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-darwin: 101-500",
"10.rebuild-darwin: 501+",
@@ -503,6 +522,7 @@ mod tests {
"10.rebuild-darwin: 2501-5000",
"10.rebuild-darwin: 5001+",
"10.rebuild-linux: 0",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
"10.rebuild-linux: 101-500",
"10.rebuild-linux: 501+",
@@ -523,6 +543,7 @@ mod tests {
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 0",
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-darwin: 101-500",
"10.rebuild-darwin: 501+",
@@ -531,6 +552,7 @@ mod tests {
"10.rebuild-darwin: 2501-5000",
"10.rebuild-darwin: 5001+",
"10.rebuild-linux: 0",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
"10.rebuild-linux: 101-500",
"10.rebuild-linux: 501+",
@@ -551,6 +573,7 @@ mod tests {
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 0",
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-darwin: 11-100",
"10.rebuild-darwin: 501+",
@@ -559,6 +582,7 @@ mod tests {
"10.rebuild-darwin: 2501-5000",
"10.rebuild-darwin: 5001+",
"10.rebuild-linux: 0",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
"10.rebuild-linux: 11-100",
"10.rebuild-linux: 501+",
@@ -579,6 +603,7 @@ mod tests {
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 0",
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-darwin: 11-100",
"10.rebuild-darwin: 501+",
@@ -587,6 +612,7 @@ mod tests {
"10.rebuild-darwin: 2501-5000",
"10.rebuild-darwin: 5001+",
"10.rebuild-linux: 0",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
"10.rebuild-linux: 11-100",
"10.rebuild-linux: 501+",
@@ -612,13 +638,15 @@ mod tests {
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 0",
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-darwin: 11-100",
"10.rebuild-darwin: 101-500",
"10.rebuild-darwin: 1001-2500",
"10.rebuild-darwin: 2501-5000",
"10.rebuild-darwin: 5001+",
"10.rebuild-linux: 0",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
"10.rebuild-linux: 11-100",
"10.rebuild-linux: 101-500",
@@ -643,13 +671,15 @@ mod tests {
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 0",
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-darwin: 11-100",
"10.rebuild-darwin: 101-500",
"10.rebuild-darwin: 1001-2500",
"10.rebuild-darwin: 2501-5000",
"10.rebuild-darwin: 5001+",
"10.rebuild-linux: 0",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
"10.rebuild-linux: 11-100",
"10.rebuild-linux: 101-500",
@@ -674,13 +704,15 @@ mod tests {
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 0",
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-darwin: 11-100",
"10.rebuild-darwin: 101-500",
"10.rebuild-darwin: 501-1000",
"10.rebuild-darwin: 2501-5000",
"10.rebuild-darwin: 5001+",
"10.rebuild-linux: 0",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
"10.rebuild-linux: 11-100",
"10.rebuild-linux: 101-500",
@@ -705,13 +737,15 @@ mod tests {
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 0",
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-darwin: 11-100",
"10.rebuild-darwin: 101-500",
"10.rebuild-darwin: 501-1000",
"10.rebuild-darwin: 2501-5000",
"10.rebuild-darwin: 5001+",
"10.rebuild-linux: 0",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
"10.rebuild-linux: 11-100",
"10.rebuild-linux: 101-500",
@@ -736,13 +770,15 @@ mod tests {
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 0",
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-darwin: 11-100",
"10.rebuild-darwin: 101-500",
"10.rebuild-darwin: 501-1000",
"10.rebuild-darwin: 1001-2500",
"10.rebuild-darwin: 5001+",
"10.rebuild-linux: 0",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
"10.rebuild-linux: 11-100",
"10.rebuild-linux: 101-500",
@@ -767,13 +803,15 @@ mod tests {
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 0",
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-darwin: 11-100",
"10.rebuild-darwin: 101-500",
"10.rebuild-darwin: 501-1000",
"10.rebuild-darwin: 1001-2500",
"10.rebuild-darwin: 5001+",
"10.rebuild-linux: 0",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
"10.rebuild-linux: 11-100",
"10.rebuild-linux: 101-500",
@@ -798,13 +836,15 @@ mod tests {
tagger.tags_to_remove(),
vec![
"10.rebuild-darwin: 0",
"10.rebuild-darwin: 1",
"10.rebuild-darwin: 1-10",
"10.rebuild-darwin: 11-100",
"10.rebuild-darwin: 101-500",
"10.rebuild-darwin: 501-1000",
"10.rebuild-darwin: 1001-2500",
"10.rebuild-darwin: 2501-5000",
"10.rebuild-linux: 0",
"10.rebuild-linux: 1",
"10.rebuild-linux: 1-10",
"10.rebuild-linux: 11-100",
"10.rebuild-linux: 101-500",