call after-merge hook

2019-03-22 14:06:57 -04:00 · 2019-03-22 14:06:57 -04:00 · 22fc680357
parent 14ff7b1e62
commit 22fc680357
1 changed files with 11 additions and 0 deletions
--- a/ofborg/src/tasks/evaluate.rs
+++ b/ofborg/src/tasks/evaluate.rs
@ -300,6 +300,17 @@ impl<E: stats::SysEvents + 'static> worker::SimpleWorker for EvaluationWorker<E>
            update_labels(&issue_ref, &[], &["2.status: merge conflict".to_owned()]);
        }

+        if self
+            .handle_strategy_err(
+                evaluation_strategy.after_merge(&mut overall_status),
+                &gists,
+                &mut overall_status,
+            )
+            .is_err()
+        {
+            return self.actions().skip(&job);
+        }
+
        overall_status
            .set_with_description("Checking new stdenvs", hubcaps::statuses::State::Pending);