diff options
| author | Lars Wirzenius <lwirzenius@wikimedia.org> | 2019-05-02 19:32:32 +0300 |
|---|---|---|
| committer | Lars Wirzenius <lwirzenius@wikimedia.org> | 2019-05-02 19:32:32 +0300 |
| commit | 6f76152d9ebca33fe133eeda8d25442a71fa9a54 (patch) | |
| tree | 98d38a0383703002888475ac5344a0379a180f09 /ci-arch.mdwn | |
| parent | ebe8c71c2bf759bc411980b67b5fe9c777ba8408 (diff) | |
| download | wmf-ci-arch-6f76152d9ebca33fe133eeda8d25442a71fa9a54.tar.gz | |
Change: clarify CIMERGES
Diffstat (limited to 'ci-arch.mdwn')
| -rw-r--r-- | ci-arch.mdwn | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ci-arch.mdwn b/ci-arch.mdwn index cf1d891..be4c443 100644 --- a/ci-arch.mdwn +++ b/ci-arch.mdwn @@ -176,7 +176,10 @@ TITLE: Future WMF CI architecture * **(POSTMERGETESTS)** Must support post-merge testing. FIXME: This needs to be explained. -* **(CIMERGES)** Must support tooling to do the merging, instead of developers. +* **(CIMERGES)** Must support tooling to do the merging, instead of + developers. We don't want developer merging by hand and pushing the + merges. CI should test changes and merge only if tests pass, so that + the branches for main lines of development are always releaseble. * **(TESTVC)** Must support storing tests in version control. |