Own the merge conflict label

2018-03-18 21:52:13 -04:00 · 2018-03-18 21:52:13 -04:00 · 5820df9683
parent 022e2090d0
commit 5820df9683
1 changed files with 13 additions and 0 deletions
--- a/ofborg/src/tasks/massrebuilder.rs
+++ b/ofborg/src/tasks/massrebuilder.rs
@ -267,7 +267,20 @@ impl<E: stats::SysEvents + 'static> worker::SimpleWorker for MassRebuildWorker<E
            );

            info!("Failed to merge {}", job.pr.head_sha);
+
+            update_labels(
+                &issue,
+                vec!["2.status: merge conflict".to_owned()],
+                vec![],
+            );
+
            return self.actions().skip(&job);
+        } else {
+            update_labels(
+                &issue,
+                vec![],
+                vec!["2.status: merge conflict".to_owned()],
+            );
        }

        overall_status.set_with_description(