diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-01 10:39:27 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-01 10:39:27 +0000 |
| commit | 425039d645e3e265e1275e1f06adecfebcf1e8aa (patch) | |
| tree | a8a00b35acd24db4e8f49b0baea0134c411c2106 /doc/ci | |
| parent | 096850a49abb54041cb3086ae34deb11e7380cb7 (diff) | |
| parent | 16719ce107c174b97da1b0e2730ff548aa39a4aa (diff) | |
| download | gitlab-ce-425039d645e3e265e1275e1f06adecfebcf1e8aa.tar.gz | |
Merge branch 'feature/sm/2783-rename-codeclimate-to-codequality-ce' into 'master'
Backport to CE: Support `codequality` job name for Code Quality feature
See merge request !13833
Diffstat (limited to 'doc/ci')
| -rw-r--r-- | doc/ci/examples/README.md | 5 | ||||
| -rw-r--r-- | doc/ci/examples/code_climate.md | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/ci/examples/README.md b/doc/ci/examples/README.md index 2458cb959ab..f094546c3bd 100644 --- a/doc/ci/examples/README.md +++ b/doc/ci/examples/README.md @@ -50,12 +50,15 @@ Apart from those, here is an collection of tutorials and guides on setting up yo - **Articles:** - [Setting up GitLab CI for Android projects](https://about.gitlab.com/2016/11/30/setting-up-gitlab-ci-for-android-projects/) +### Code quality analysis + +- [Analyze code quality with the Code Climate CLI](code_climate.md) + ### Other - [Using `dpl` as deployment tool](deployment/README.md) - [Repositories 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) -- [Analyze code quality with the Code Climate CLI](code_climate.md) - **Articles:** - [Continuous Deployment with GitLab: how to build and deploy a Debian Package with GitLab CI](https://about.gitlab.com/2016/10/12/automated-debian-package-build-with-gitlab-ci/) diff --git a/doc/ci/examples/code_climate.md b/doc/ci/examples/code_climate.md index 5659a8c2a2a..4d0ba8bfef3 100644 --- a/doc/ci/examples/code_climate.md +++ b/doc/ci/examples/code_climate.md @@ -5,10 +5,10 @@ GitLab CI and Docker. First, you need GitLab Runner with [docker-in-docker executor][dind]. -Once you set up the Runner, add a new job to `.gitlab-ci.yml`, called `codeclimate`: +Once you set up the Runner, add a new job to `.gitlab-ci.yml`, called `codequality`: ```yaml -codeclimate: +codequality: image: docker:latest variables: DOCKER_DRIVER: overlay @@ -22,7 +22,7 @@ codeclimate: paths: [codeclimate.json] ``` -This will create a `codeclimate` job in your CI pipeline and will allow you to +This will create a `codequality` job in your CI pipeline and will allow you to download and analyze the report artifact in JSON format. For GitLab [Enterprise Edition Starter][ee] users, this information can be automatically |