summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-04-04 17:27:32 +0200
committerRémy Coutable <remy@rymai.me>2018-04-04 17:27:32 +0200
commit34c6d526b0be4adb499bb0fbd217c47ebbc7144a (patch)
treec736aa5e1ed2b8e1228925cfde38acf9bd5bb166
parentf8365c3d6dc0925ff1ae7eda09fb4fab8884c58b (diff)
downloadgitlab-ce-34c6d526b0be4adb499bb0fbd217c47ebbc7144a.tar.gz
Don't run RuboCop nor ESLint checks in the codequality job as this is already done by the static-analysis job44978-consider-removing-rubocop-and-eslint-from-codeclimate-yml
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--.codeclimate.yml6
-rw-r--r--.gitlab-ci.yml3
2 files changed, 0 insertions, 9 deletions
diff --git a/.codeclimate.yml b/.codeclimate.yml
index 216ecf43beb..8699a903f2a 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -10,12 +10,6 @@ engines:
- javascript
exclude_paths:
- "lib/api/v3/*"
- eslint:
- enabled: true
- channel: "eslint-4"
- rubocop:
- enabled: true
- channel: "gitlab-rubocop-0-52-1"
ratings:
paths:
- Gemfile.lock
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 86bdb7a4643..faa3db80fd4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -632,9 +632,6 @@ codequality:
cache: {}
dependencies: []
script:
- # Get the custom rubocop codeclimate image (https://gitlab.com/gitlab-org/codeclimate-rubocop/wikis/home)
- - docker pull dev.gitlab.org:5005/gitlab/gitlab-build-images:gitlab-codeclimate-rubocop-0-52-1
- - docker tag dev.gitlab.org:5005/gitlab/gitlab-build-images:gitlab-codeclimate-rubocop-0-52-1 codeclimate/codeclimate-rubocop:gitlab-codeclimate-rubocop-0-52-1
# 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