summaryrefslogtreecommitdiff
path: root/doc/ci
diff options
context:
space:
mode:
authorZ.J. van de Weg <zegerjan@gitlab.com>2016-08-14 15:10:16 +0200
committerZ.J. van de Weg <zegerjan@gitlab.com>2016-09-09 12:01:54 +0200
commita9f5b8881c6f6621dee880744dc04b92c85a5938 (patch)
treee7e4507a94ec57e71c73e51f3462c88420d6f4e8 /doc/ci
parent30f5b9a5b711b46f1065baf755e413ceced5646b (diff)
downloadgitlab-ce-a9f5b8881c6f6621dee880744dc04b92c85a5938.tar.gz
Minor update on CI docs exampleszj-update-ci-examples-doc
Triggered by gitlab-org/gitlab-ci-yml#1 I've investigated how this is organized so far and did a minor clean up. In my opinion we should just keep a list of up to date blog posts in the docs and examples should be included in gitlab-org/gitlab-ci-yml. This reduces the number of projects and docs pages one has to look for information. [ci skip]
Diffstat (limited to 'doc/ci')
-rw-r--r--doc/ci/examples/README.md14
1 files changed, 8 insertions, 6 deletions
diff --git a/doc/ci/examples/README.md b/doc/ci/examples/README.md
index c134106bfd0..406396deaaa 100644
--- a/doc/ci/examples/README.md
+++ b/doc/ci/examples/README.md
@@ -1,17 +1,19 @@
# CI Examples
+A collection of `.gitlab-ci.yml` files is maintained at the [GitLab CI Yml project][gitlab-ci-templates].
+If your favorite programming language or framework are missing we would love your help by sending a merge request
+with a `.gitlab-ci.yml`.
+
+Apart from those, here is an collection of tutorials and guides on setting up your CI pipeline:
+
- [Testing a PHP application](php.md)
- [Test and deploy a Ruby application to Heroku](test-and-deploy-ruby-application-to-heroku.md)
- [Test and deploy a Python application to Heroku](test-and-deploy-python-application-to-heroku.md)
- [Test a Clojure application](test-clojure-application.md)
- [Test a Scala application](test-scala-application.md)
- [Using `dpl` as deployment tool](deployment/README.md)
-- Help your favorite programming language and GitLab by sending a merge request
- with a guide for that language.
-
-## Outside the documentation
-
- [Blog post about using GitLab CI for iOS projects](https://about.gitlab.com/2016/03/10/setting-up-gitlab-ci-for-ios-projects/)
- [Repo's with examples for various languages](https://gitlab.com/groups/gitlab-examples)
- [The .gitlab-ci.yml file for GitLab itself](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/.gitlab-ci.yml)
-- [A collection of useful .gitlab-ci.yml templates](https://gitlab.com/gitlab-org/gitlab-ci-yml)
+
+[gitlab-ci-templates][https://gitlab.com/gitlab-org/gitlab-ci-yml]