diff options
| author |  Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr> | 2018-05-22 11:09:58 +0200 |
|---|---|---|
| committer | Théo Zimmermann <theo.zimmermann@univ-paris-diderot.fr> | 2018-05-24 16:44:40 +0200 |
| commit | c0dd7253faa83d1f3230e57071073df321a5e389 (patch) | |
| tree | e5406500c63a7087ed8de023e293814edbd74528 /dev/ci/user-overlays | |
| parent | e43b85c925c0c9c87e1dde69760d9ea343c5cfa8 (diff) | |
Improve merging and overlay documentations.
Clarification prompted by Jim Fehrle.
[ci skip]
Diffstat (limited to 'dev/ci/user-overlays')
| -rw-r--r-- | dev/ci/user-overlays/README.md | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/dev/ci/user-overlays/README.md b/dev/ci/user-overlays/README.md index a7474e324..3414a8786 100644 --- a/dev/ci/user-overlays/README.md +++ b/dev/ci/user-overlays/README.md @@ -1,8 +1,21 @@ # Add overlays for your pull requests in this directory -An overlay is a file containing very simple logic to test whether we are currently building a specific pull request or git branch (useful so that overlays work on your own fork) and which changes some of the variables whose default can be found in [`ci-basic-overlay.sh`](/dev/ci/ci-basic-overlay.sh). +When your pull request breaks an external development we test in our CI, you +must prepare a patch (or ask someone to prepare a patch) to fix this development. +Backward compatible patches are to be preferred, especially on libraries (it is +harder to make backward compatible patches for plugins). -The name of your overlay file should be of the form `five_digit_PR_number-GitHub_handle-branch_name.sh`. +Once you have a patched version, you can add an overlay to your pull request: +this is a file which defines where to look for the patched version so that +testing is possible. It changes the value of some variables from +[`ci-basic-overlay.sh`](/dev/ci/ci-basic-overlay.sh) (generally both the +`_CI_BRANCH` and the `_CI_GITURL` variables of a given development at once). + +The file contains very simple logic to test the pull request number or branch +name and apply it only in this case. + +The name of your overlay file should be of the form +`five_digit_PR_number-GitHub_handle-branch_name.sh`. Example: `00669-maximedenes-ssr-merge.sh` containing |