summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLin Jen-Shin <godfat@godfat.org>2017-03-06 19:20:28 +0800
committerLin Jen-Shin <godfat@godfat.org>2017-03-06 19:21:12 +0800
commit7c9cff3a744a64848207bfde1aedcfe652f07dce (patch)
tree286a79f84938536ba02b24355a67bc0416f5cca9
parent0fe0b044e49729147461624fcc5e469618e34936 (diff)
downloadgitlab-ce-set-default-cache-key-for-jobs.tar.gz
Update for document feedback:set-default-cache-key-for-jobs
* https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666#note_24829863 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666#note_24829880 * https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9666#note_24830028
-rw-r--r--doc/ci/yaml/README.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 221515e4457..f4224496207 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -166,8 +166,8 @@ which can be set in GitLab's UI.
cached between jobs. You can only use paths that are within the project
workspace.
-**By default caching is enabled and shared between each pipelines and
-each jobs, starting from GitLab 9.0**
+**By default caching is enabled and shared between pipelines and jobs,
+starting from GitLab 9.0**
If `cache` is defined outside the scope of jobs, it means it is set
globally and all jobs will use that definition.
@@ -219,9 +219,9 @@ rspec:
- binaries/
```
-Note that since cache is shared between each jobs, if you're using different
+Note that since cache is shared between jobs, if you're using different
paths for different jobs, you should also set a different *cache:key*
-otherwise they could be overwriting to each other.
+otherwise cache content can be overwritten.
The cache is provided on a best-effort basis, so don't expect that the cache
will be always present. For implementation details, please check GitLab Runner.