summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLeandro Camargo <leandroico@gmail.com>2016-12-05 02:00:47 -0200
committerLeandro Camargo <leandroico@gmail.com>2017-01-25 01:07:44 -0200
commit6323cd7203dbf1850e7939e81db4b1a9c6cf6d76 (patch)
treeca9a9450c85337fcaab7c9ecc83d92903826d06e /doc
parentf1e920ed86133bfea0abfc66ca44282813822073 (diff)
downloadgitlab-ce-6323cd7203dbf1850e7939e81db4b1a9c6cf6d76.tar.gz
Comply to more requirements and requests made in the code review
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/yaml/README.md16
1 files changed, 9 insertions, 7 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 0a264c0e228..5e2d9788f33 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -286,11 +286,13 @@ build outputs. Setting this up globally will make all the jobs to use this
setting for output filtering and extracting the coverage information from your
builds.
-Regular expressions are used by default. So using surrounding `/` is optional, given it'll always be read as a regular expression. Don't forget to escape special characters whenever you want to match them in the regular expression.
+Regular expressions are used by default. So using surrounding `/` is optional,
+given it'll always be read as a regular expression. Don't forget to escape
+special characters whenever you want to match them literally.
A simple example:
```yaml
-coverage: \(\d+\.\d+\) covered\.
+coverage: /\(\d+\.\d+\) covered\./
```
## Jobs
@@ -1014,19 +1016,19 @@ job:
This entry is pretty much the same as described in the global context in
[`coverage`](#coverage). The only difference is that, by setting it inside
the job level, whatever is set in there will take precedence over what has
-been defined in the global level. A quick example of one overwritting the
+been defined in the global level. A quick example of one overriding the
other would be:
```yaml
-coverage: \(\d+\.\d+\) covered\.
+coverage: /\(\d+\.\d+\) covered\./
job1:
- coverage: Code coverage: \d+\.\d+
+ coverage: /Code coverage: \d+\.\d+/
```
In the example above, considering the context of the job `job1`, the coverage
-regex that would be used is `Code coverage: \d+\.\d+` instead of
-`\(\d+\.\d+\) covered\.`.
+regex that would be used is `/Code coverage: \d+\.\d+/` instead of
+`/\(\d+\.\d+\) covered\./`.
## Git Strategy