danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

Merge pull request #410 from Ekleog/run-passhtru-tests

Browse source 
nixpkgs-rs: build .passthru.tests too
This commit is contained in:
Graham Christensen 2020-04-01 20:37:03 -04:00 committed by GitHub
parent 7be15ba6d1 50f5232b51
commit 4093eaeeee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -312,6 +312,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();
@ -319,11 +320,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(),