diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-08-15 13:35:55 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2021-08-15 13:35:55 +0300 |
| commit | 7e1e7ecefdb968221e15535d8d2b7f05c9109c96 (patch) | |
| tree | ae7c86ad31a5f8efa7fba9bed1ad22b2a0685c42 | |
| parent | 3340d373fba559dde43fffae9bb21be37bee7ff1 (diff) | |
| download | meson-cigreen.zip meson-cigreen.tar.gz meson-cigreen.tar.bz2 | |
Document new rules for green CI.cigreen
| -rw-r--r-- | docs/markdown/Contributing.md | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md index 03fc2a4..77e5165 100644 --- a/docs/markdown/Contributing.md +++ b/docs/markdown/Contributing.md @@ -83,6 +83,21 @@ In a simplified list form the split would look like the following: - changes breaking backwards compatibility - support for new languages +## A green CI run is mandatory for merging + +No merge request may be merged until it has a fully green CI run. It +does not matter why CI fails, it is a hard blocker. Even if the MR +could possibly not have anything to do with the failure and clearly +should be permitted, it may not be merged. Only MRs that fix the CI +issue are allowed to land in trunk. + +There is one, and only one, exception to this. At the time of writing +the Apple CI is unreliable and sometimes fails with clock skew errors. + +If a merge causes CI failure any developer can revert it out of +master. It is then the responsibility of the original submitter to +resubmit a fixed version. + ## Strategy for merging pull requests to trunk Meson's merge strategy should fulfill the following guidelines: |