From 2d0c4264d19b82878673909f4e3da3aa20f058b5 Mon Sep 17 00:00:00 2001 From: Connor Gilbert Date: Wed, 13 Nov 2024 20:24:15 -0800 Subject: [PATCH 1/2] ci: remove CodeClimate-based quality scanning --- .codeclimate.yml | 12 ------------ .gitlab-ci.yml | 11 ----------- 2 files changed, 23 deletions(-) delete mode 100644 .codeclimate.yml diff --git a/.codeclimate.yml b/.codeclimate.yml deleted file mode 100644 index 0e98ab3960..0000000000 --- a/.codeclimate.yml +++ /dev/null @@ -1,12 +0,0 @@ -# This configuration file was added to enable ESLint 8 as GitLab Code Quality -# does not support ESLint 8 as of GitLab 15.0. Once Code Quality officially -# supports ESLint 8, remove this file for the simplicity. -# See https://gitlab.com/gitlab-org/ci-cd/codequality/-/issues/52 -version: "2" -plugins: - eslint: - enabled: true - channel: "eslint-8" -exclude_patterns: - - "tests/" - - "**/*.spec.js" diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ff07281d51..1d7468297b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,6 @@ variables: GITLAB_ADVANCED_SAST_ENABLED: 'true' include: - - template: Jobs/Code-Quality.gitlab-ci.yml - template: Jobs/Dependency-Scanning.latest.gitlab-ci.yml - template: Jobs/SAST.latest.gitlab-ci.yml - template: Jobs/Secret-Detection.latest.gitlab-ci.yml @@ -35,16 +34,6 @@ include: .is-gitlab-ui-mr: &is-gitlab-ui-mr if: '$CI_MERGE_REQUEST_IID && $CI_PROJECT_PATH == "gitlab-org/gitlab-ui"' - -code_quality: - needs: [] - # Code quality scanning doesn't work otherwise on MR pipelines - rules: - - when: always - # It's running docker-in-docker, so we want to set the correct tag - tags: - - gitlab-org-docker - # Execute the security scanners immediately gemnasium-dependency_scanning: needs: [] -- GitLab From e4c5b91c49d280b02a196eab7f64718802c457ec Mon Sep 17 00:00:00 2001 From: Connor Gilbert Date: Mon, 18 Nov 2024 12:12:23 -0800 Subject: [PATCH 2/2] ci: save ESLint output as a Code Quality artifact --- .gitlab-ci.yml | 7 ++++++- package.json | 1 + yarn.lock | 13 +++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d7468297b..a610b61453 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -204,8 +204,10 @@ lint: extends: [.node, .yarn_install] needs: [] stage: test + variables: + ESLINT_CODE_QUALITY_REPORT: "gl-code-quality-report-eslint.json" script: - - yarn eslint + - yarn eslint --format gitlab - yarn prettier - yarn stylelint - yarn markdownlint @@ -214,6 +216,9 @@ lint: && echo "Vue components should not contain