the-distro/ofborg
2
0
Fork 1
Code Issues 1 Pull requests 1 Packages Projects Releases Wiki Activity

nixpkgs-rs: build .passthru.tests too

Browse source 
Fixes https://github.com/NixOS/ofborg/issues/368
This commit is contained in:
Léo Gaspard 2019-10-27 14:27:41 +01:00
parent ce5f77632a
commit 50f5232b51
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ofborg/src/tasks/eval/nixpkgs.rs
View file

@ -305,6 +305,7 @@ impl<'a> NixpkgsStrategy<'a> {
.keys() .keys()
.map(|pkgarch| pkgarch.package.clone()) .map(|pkgarch| pkgarch.package.clone())
.filter(|pkg| possibly_touched_packages.contains(&pkg)) .filter(|pkg| possibly_touched_packages.contains(&pkg))
.flat_map(|pkg| vec![pkg.clone(), pkg + ".passthru.tests"].into_iter())
.collect(); .collect();
try_build.sort(); try_build.sort();
try_build.dedup(); try_build.dedup();
@ -312,11 +313,11 @@ impl<'a> NixpkgsStrategy<'a> {
status.set_url(None); status.set_url(None);
status.set(hubcaps::statuses::State::Success); 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 // In the case of trying to merge master in to
// a stable branch, we don't want to do this. // a stable branch, we don't want to do this.
// Therefore, only schedule builds if there // Therefore, only schedule builds if there
// less than or exactly 10 // less than or exactly 20
Ok(vec![BuildJob::new( Ok(vec![BuildJob::new(
self.job.repo.clone(), self.job.repo.clone(),
self.job.pr.clone(), self.job.pr.clone(),