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

Pass the last 10 lines to the build-result in all cases

Browse source
This commit is contained in:
Graham Christensen 2018-03-18 18:31:57 -04:00
parent df100542d4
commit ec75dba4da
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ofborg/src/tasks/build.rs
View file

@ -96,8 +96,11 @@ impl<'a, 'b> JobActions<'a, 'b> {
}; };
} }
pub fn log_snippet(&self) -> VecDeque<String> { pub fn log_snippet(&self) -> Vec<String> {
self.snippet_log.clone() self.snippet_log
.clone()
.into_iter()
.collect::<Vec<String>>()
} }
pub fn commit_missing(&mut self) { pub fn commit_missing(&mut self) {
@ -199,7 +202,7 @@ impl<'a, 'b> JobActions<'a, 'b> {
repo: self.job.repo.clone(), repo: self.job.repo.clone(),
pr: self.job.pr.clone(), pr: self.job.pr.clone(),
system: self.system.clone(), system: self.system.clone(),
output: vec![], output: self.log_snippet(),
attempt_id: self.attempt_id.clone(), attempt_id: self.attempt_id.clone(),
skipped_attrs: Some(not_attempted_attrs), skipped_attrs: Some(not_attempted_attrs),
attempted_attrs: None, attempted_attrs: None,
@ -225,7 +228,7 @@ impl<'a, 'b> JobActions<'a, 'b> {
self.tell(worker::Action::Ack); self.tell(worker::Action::Ack);
} }
pub fn build_finished(&mut self, success: bool, lines: Vec<String>, pub fn build_finished(&mut self, success: bool,
attempted_attrs: Vec<String>, attempted_attrs: Vec<String>,
not_attempted_attrs: Vec<String>, not_attempted_attrs: Vec<String>,
@ -234,7 +237,7 @@ impl<'a, 'b> JobActions<'a, 'b> {
repo: self.job.repo.clone(), repo: self.job.repo.clone(),
pr: self.job.pr.clone(), pr: self.job.pr.clone(),
system: self.system.clone(), system: self.system.clone(),
output: lines, output: self.log_snippet(),
attempt_id: self.attempt_id.clone(), attempt_id: self.attempt_id.clone(),
success: Some(success), success: Some(success),
attempted_attrs: Some(attempted_attrs), attempted_attrs: Some(attempted_attrs),
@ -388,9 +391,8 @@ impl notifyworker::SimpleNotifyWorker for BuildWorker {
actions.log_snippet().iter().inspect(|x| println!("{}", x)).last(); actions.log_snippet().iter().inspect(|x| println!("{}", x)).last();
println!("----->8-----"); println!("----->8-----");
let last10lines: Vec<String> = actions.log_snippet().into_iter().collect::<Vec<String>>();
actions.build_finished(success, last10lines.clone(), can_build, cannot_build_attrs); actions.build_finished(success, can_build, cannot_build_attrs);
println!("Done!"); println!("Done!");
} }
} }