Commit 5d0cd8b6 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'bug/misleading-ci-yaml-documentation' into 'master'

Fixes an invalid documentation for the .gitlab-ci.yml cache:key

See merge request gitlab-org/gitlab-ce!17047
parents ca297d7a 73f999d4
...@@ -276,7 +276,7 @@ To enable per-branch caching: ...@@ -276,7 +276,7 @@ To enable per-branch caching:
```yaml ```yaml
cache: cache:
key: "$CI_COMMIT_REF_NAME" key: "$CI_COMMIT_REF_SLUG"
untracked: true untracked: true
``` ```
...@@ -284,7 +284,7 @@ To enable per-job and per-branch caching: ...@@ -284,7 +284,7 @@ To enable per-job and per-branch caching:
```yaml ```yaml
cache: cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME" key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
untracked: true untracked: true
``` ```
...@@ -292,7 +292,7 @@ To enable per-branch and per-stage caching: ...@@ -292,7 +292,7 @@ To enable per-branch and per-stage caching:
```yaml ```yaml
cache: cache:
key: "$CI_JOB_STAGE-$CI_COMMIT_REF_NAME" key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG"
untracked: true untracked: true
``` ```
...@@ -301,7 +301,7 @@ If you use **Windows Batch** to run your shell scripts you need to replace ...@@ -301,7 +301,7 @@ If you use **Windows Batch** to run your shell scripts you need to replace
```yaml ```yaml
cache: cache:
key: "%CI_JOB_STAGE%-%CI_COMMIT_REF_NAME%" key: "%CI_JOB_STAGE%-%CI_COMMIT_REF_SLUG%"
untracked: true untracked: true
``` ```
...@@ -310,7 +310,7 @@ If you use **Windows PowerShell** to run your shell scripts you need to replace ...@@ -310,7 +310,7 @@ If you use **Windows PowerShell** to run your shell scripts you need to replace
```yaml ```yaml
cache: cache:
key: "$env:CI_JOB_STAGE-$env:CI_COMMIT_REF_NAME" key: "$env:CI_JOB_STAGE-$env:CI_COMMIT_REF_SLUG"
untracked: true untracked: true
``` ```
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment