diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-08-20 11:43:58 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-08-20 11:43:58 +0000 |
| commit | b2cc54eb41cc36e829cbe4223ae8ee019651be64 (patch) | |
| tree | f5c75659c29261c5a858b4865cd5d48af060a9a5 | |
| parent | 0a73c1c5833ac5a86289418e93b5d50aa8e89cbd (diff) | |
| parent | bc53c4f0b6e1fba6d72e9a47f2e8846697f56371 (diff) | |
| download | gitlab-ce-b2cc54eb41cc36e829cbe4223ae8ee019651be64.tar.gz | |
Merge branch 'dosuken123-master-patch-47251' into 'master'
Fix code quality reports
See merge request gitlab-org/gitlab-ce!21275
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd02d72b4c2..797a20ef16e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -739,7 +739,7 @@ karma: - chrome_debug.log - coverage-javascript/ -codequality: +code_quality: <<: *dedicated-no-docs-no-db-pull-cache-job image: docker:stable allow_failure: true @@ -757,9 +757,13 @@ codequality: script: # Extract "MAJOR.MINOR" from CI_SERVER_VERSION and generate "MAJOR-MINOR-stable" for Security Products - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/') - - docker run --env SOURCE_CODE="$PWD" --volume "$PWD":/code --volume /var/run/docker.sock:/var/run/docker.sock "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code + - docker run + --env SOURCE_CODE="$PWD" + --volume "$PWD":/code + --volume /var/run/docker.sock:/var/run/docker.sock + "registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code artifacts: - paths: [codeclimate.json] + paths: [gl-code-quality-report.json] expire_in: 1 week sast: |