From 50f5232b51959db8f1373efd0d2c380d7f3b18c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sun, 27 Oct 2019 14:27:41 +0100 Subject: [PATCH] nixpkgs-rs: build .passthru.tests too Fixes https://github.com/NixOS/ofborg/issues/368 --- ofborg/src/tasks/eval/nixpkgs.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ofborg/src/tasks/eval/nixpkgs.rs b/ofborg/src/tasks/eval/nixpkgs.rs index 01762d6..ab54e48 100644 --- a/ofborg/src/tasks/eval/nixpkgs.rs +++ b/ofborg/src/tasks/eval/nixpkgs.rs @@ -305,6 +305,7 @@ impl<'a> NixpkgsStrategy<'a> { .keys() .map(|pkgarch| pkgarch.package.clone()) .filter(|pkg| possibly_touched_packages.contains(&pkg)) + .flat_map(|pkg| vec![pkg.clone(), pkg + ".passthru.tests"].into_iter()) .collect(); try_build.sort(); try_build.dedup(); @@ -312,11 +313,11 @@ impl<'a> NixpkgsStrategy<'a> { status.set_url(None); status.set(hubcaps::statuses::State::Success); - if !try_build.is_empty() && try_build.len() <= 10 { + if !try_build.is_empty() && try_build.len() <= 20 { // In the case of trying to merge master in to // a stable branch, we don't want to do this. // Therefore, only schedule builds if there - // less than or exactly 10 + // less than or exactly 20 Ok(vec![BuildJob::new( self.job.repo.clone(), self.job.pr.clone(),