summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2016-02-03 14:32:13 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-02-03 14:32:13 +0000
commitbb51e9c66ee91f70f11f210b03fe0a36885bb05d (patch)
treed92ce066167688d4c96eb2e9e00db6c22c16338c /doc
parentc1faa836f6711695f2105e7405c2ea438382a5a8 (diff)
parentacea6e1c507cf35123a8fe87ca708683719f4820 (diff)
downloadgitlab-ce-bb51e9c66ee91f70f11f210b03fe0a36885bb05d.tar.gz
Merge branch 'fix-build-artifacts-doc' into 'master'
Cleanup artifacts section in Docs - Added Note that artifact collection is only done for successful builds. - Cleaned up Windows Support and Version notes. See merge request !2619
Diffstat (limited to 'doc')
-rw-r--r--doc/ci/yaml/README.md8
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 4d280297dbb..194c8171bb9 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -393,8 +393,12 @@ The above script will:
### artifacts
-_**Note:** Introduced in GitLab Runner v0.7.0. Also, the Windows shell executor
- does not currently support artifact uploads._
+_**Note:** Introduced in GitLab Runner v0.7.0 for non-Windows platforms._
+
+_**Note:** Limited Windows support was added in GitLab Runner v.1.0.0.
+Currently not all executors are supported._
+
+_**Note:** Build artifacts are only collected for successful builds._
`artifacts` is used to specify list of files and directories which should be
attached to build after success. Below are some examples.