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

Own the merge conflict label

Browse source
This commit is contained in:
Graham Christensen 2018-03-18 21:52:13 -04:00
parent 022e2090d0
commit 5820df9683
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -267,7 +267,20 @@ impl<E: stats::SysEvents + 'static> worker::SimpleWorker for MassRebuildWorker<E
); );
info!("Failed to merge {}", job.pr.head_sha); info!("Failed to merge {}", job.pr.head_sha);
update_labels(
&issue,
vec!["2.status: merge conflict".to_owned()],
vec![],
);
return self.actions().skip(&job); return self.actions().skip(&job);
} else {
update_labels(
&issue,
vec![],
vec!["2.status: merge conflict".to_owned()],
);
} }
overall_status.set_with_description( overall_status.set_with_description(