summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-06-14 09:42:26 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-06-14 09:42:26 +0000
commit1f0a901052c3d8d1aee48b919d1932b2bd3961a3 (patch)
tree4bd76f2dfd1e95109a464c2c1ccf9eb6ffb03bdf
parent5694a00ec591077ee3d03d72ceb85d00d0603e6a (diff)
parent9f432f6ebf65e0d2772d87610cd8f05a68824146 (diff)
downloadgitlab-ce-1f0a901052c3d8d1aee48b919d1932b2bd3961a3.tar.gz
Merge branch 'cache-doc-fix' into 'master'
Remove incorrect CI doc re: PowerShell Closes #40164 See merge request gitlab-org/gitlab-ce!19622
-rw-r--r--changelogs/unreleased/cache-doc-fix.yml5
-rw-r--r--doc/ci/yaml/README.md10
2 files changed, 5 insertions, 10 deletions
diff --git a/changelogs/unreleased/cache-doc-fix.yml b/changelogs/unreleased/cache-doc-fix.yml
new file mode 100644
index 00000000000..db4726a92e9
--- /dev/null
+++ b/changelogs/unreleased/cache-doc-fix.yml
@@ -0,0 +1,5 @@
+---
+title: 'Remove incorrect CI doc re: PowerShell'
+merge_request: 19622
+author: gfyoung
+type: fixed
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index f946536701e..8e13ceb9257 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -799,16 +799,6 @@ cache:
- binaries/
```
-If you use **Windows PowerShell** to run your shell scripts you need to replace
-`$` with `$env:`:
-
-```yaml
-cache:
- key: "$env:CI_COMMIT_REF_SLUG"
- paths:
- - binaries/
-```
-
### `cache:untracked`
Set `untracked: true` to cache all files that are untracked in your Git