From fbf5024c638832f25d8a373a1107abcf1eea9189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 4 Apr 2018 17:27:32 +0200
Subject: [PATCH] Don't run RuboCop nor ESLint checks in the codequality job as
this is already done by the static-analysis job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Rémy Coutable <remy@rymai.me>
---
.codeclimate.yml | 6 ------
.gitlab-ci.yml | 3 ---
2 files changed, 9 deletions(-)
diff --git a/.codeclimate.yml b/.codeclimate.yml
index 216ecf43beb22..8699a903f2ab8 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 505f5034aa58c..eac9be7d6ee80 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -722,9 +722,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
--
GitLab