aboutsummaryrefslogtreecommitdiff
path: root/docs/markdown/Contributing.md
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2020-04-21 00:37:34 +0300
committerGitHub <noreply@github.com>2020-04-21 00:37:34 +0300
commit84f28fc3f16fc46f792da94ffb572cc043c7ad2c (patch)
tree6b86c392ef449cdffab4c1b925d610a1e7b436bb /docs/markdown/Contributing.md
parent89bd55b9da6675d17bd4431aed99354603a7b312 (diff)
parenteb45ce6189870181b9d8a8eb07cfeab55a0ed012 (diff)
downloadmeson-84f28fc3f16fc46f792da94ffb572cc043c7ad2c.zip
meson-84f28fc3f16fc46f792da94ffb572cc043c7ad2c.tar.gz
meson-84f28fc3f16fc46f792da94ffb572cc043c7ad2c.tar.bz2
Merge pull request #6816 from dcbaker/framework-matrix
project test junit schema + a few more uses
Diffstat (limited to 'docs/markdown/Contributing.md')
-rw-r--r--docs/markdown/Contributing.md12
1 files changed, 10 insertions, 2 deletions
diff --git a/docs/markdown/Contributing.md b/docs/markdown/Contributing.md
index 6f4c397..5332938 100644
--- a/docs/markdown/Contributing.md
+++ b/docs/markdown/Contributing.md
@@ -294,9 +294,17 @@ Additionally, the `skip_on_env` key can be used to specify a list of environment
variables. If at least one environment variable in `skip_on_env` is present, all
matrix entries containing this value are skipped.
-Similarly, the `compilers` key can be used to define a set of compilers required
-for this value.
+Similarly, the `compilers` key can be used to define a mapping of compilers to languages that are required for this value.
+```json
+{
+ "compilers": {
+ "c": "gcc",
+ "cpp": "gcc",
+ "d": "gdc"
+ }
+}
+```
Specific option combinations can be excluded with the `exclude` section. It should
be noted that `exclude` does not require exact matches. Instead, any matrix entry