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

merge conflict labels: move

Browse source
This commit is contained in:
Graham Christensen 2019-03-22 16:00:42 -04:00
parent ed0882a975
commit 6cbaa5d5c6
No known key found for this signature in database
GPG key ID: ACA1C1D120C83D5C
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -352,9 +352,21 @@ impl<'a> EvaluationStrategy for NixpkgsStrategy<'a> {
Ok(())
}
fn merge_conflict(&mut self) {}
fn merge_conflict(&mut self) {
update_labels(
&self.issue_ref,
&["2.status: merge conflict".to_owned()],
&[],
);
}
fn after_merge(&mut self, status: &mut CommitStatus) -> StepResult<()> {
update_labels(
&self.issue_ref,
&[],
&["2.status: merge conflict".to_owned()],
);
status.set_with_description("Checking new stdenvs", hubcaps::statuses::State::Pending);
self.check_stdenvs_after();

4
ofborg/src/tasks/evaluate.rs
View file

@ -250,11 +250,9 @@ impl<E: stats::SysEvents + 'static> worker::SimpleWorker for EvaluationWorker<E>
info!("Failed to merge {}", job.pr.head_sha);
update_labels(&issue_ref, &["2.status: merge conflict".to_owned()], &[]);
evaluaton_strategy.merge_conflict();
return self.actions().skip(&job);
} else {
update_labels(&issue_ref, &[], &["2.status: merge conflict".to_owned()]);
}
if self