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

Begin improving the target branch failure output, re #25

Browse source
This commit is contained in:
Graham Christensen 2017-12-20 07:51:25 -05:00
parent 7ca5463991
commit 60bbed5901
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ofborg/src/outpathdiff.rs
View file

@ -49,16 +49,16 @@ impl OutPathDiff {
return result;
}
pub fn find_before(&mut self) -> bool {
pub fn find_before(&mut self) -> Result<bool, File> {
let x = self.run();
match x {
Ok(f) => {
self.original = Some(self.parse(f));
return true;
return Ok(true);
}
Err(_) => {
Err(e) => {
info!("Failed to find Before list");
return false;
return Err(e);
}
}
}

13
ofborg/src/tasks/massrebuilder.rs
View file

@ -126,11 +126,19 @@ impl worker::SimpleWorker for MassRebuildWorker {
hubcaps::statuses::State::Pending
);
if !rebuildsniff.find_before() {
if let Err(mut output) = rebuildsniff.find_before() {
overall_status.set_url(make_gist(
&gists,
"Output path comparison".to_owned(),
Some("".to_owned()),
file_to_str(&mut output),
));
overall_status.set_with_description(
format!("Failed to enumerate outputs of {}", &target_branch).as_ref(),
format!("Target branch {} doesn't evaluate!", &target_branch).as_ref(),
hubcaps::statuses::State::Failure
);
return self.actions().skip(&job);
}
@ -293,7 +301,6 @@ impl worker::SimpleWorker for MassRebuildWorker {
}
}
status.set_url(gist_url);
status.set(state.clone());