From 510509dc863f1c4815a0de12a8394b193c701039 Mon Sep 17 00:00:00 2001 From: Guillaume Pasero <guillaume.pasero@c-s.fr> Date: Fri, 6 Apr 2018 18:30:13 +0200 Subject: [PATCH] DOC: alternative proposal for broken dashboard fixes --- CONTRIBUTING.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ef95be0bfc..d31b3f3f9d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -58,10 +58,14 @@ then send a merge request. Note that we also accept PRs on our [GitHub mirror](https://github.com/orfeotoolbox/OTB) which we will manually merge. -Caveat: if the Dashboard build on develop branch is broken, it is possible for -core developers to push their fixes directly on develop (to gain time) but this -is strictly limited to compilation error fixes. It is assumed that core -developers are aware of the multi-platform environment on the Dashboard. +Caveat: even if the Dashboard build on develop branch is broken, it is not +allowed to push fixes directly on develop. The developer trying to fix the +build should create a merge request and submit it for review. However in that +case, it is not mandatory to wait for a green dashboard if: + +* the developer has confirmed that proposed changes fix the compilation +* the reviewers agree for a fast merge. + ### Commit message -- GitLab