diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-09-02 09:06:02 +0000 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-09-02 09:06:02 +0000 |
| commit | 7f5eea27991c8892faceae31812d432efbec1925 (patch) | |
| tree | 056587da2cf9b55c49a3921ad51b18adb8b287cf | |
| parent | b7398bc1fdad6c721cfa35ff17cebc2cb00c8240 (diff) | |
| parent | ed437b248d6f468a5aa0a64f6c94ce4b517144fc (diff) | |
| download | gitlab-ce-7f5eea27991c8892faceae31812d432efbec1925.tar.gz | |
Merge branch 'winh-ci-lint-javascript-report' into 'master'
Remove lint:javascript:report job
See merge request gitlab-org/gitlab-ce!32462
| -rw-r--r-- | .gitlab/ci/frontend.gitlab-ci.yml | 19 | ||||
| -rw-r--r-- | .gitlab/ci/pages.gitlab-ci.yml | 3 |
2 files changed, 1 insertions, 21 deletions
diff --git a/.gitlab/ci/frontend.gitlab-ci.yml b/.gitlab/ci/frontend.gitlab-ci.yml index df38cb4ff8e..0d73092cfba 100644 --- a/.gitlab/ci/frontend.gitlab-ci.yml +++ b/.gitlab/ci/frontend.gitlab-ci.yml @@ -234,25 +234,6 @@ qa-frontend-node:latest: image: node:latest allow_failure: true -lint:javascript:report: - extends: - - .default-tags - - .default-retry - - .default-cache - - .except-docs - variables: - SETUP_DB: "false" - stage: post-test - dependencies: [] - script: - - date - - yarn run eslint-report || true # ignore exit code - artifacts: - name: eslint-report - expire_in: 31d - paths: - - eslint-report.html - jsdoc: extends: - .default-tags diff --git a/.gitlab/ci/pages.gitlab-ci.yml b/.gitlab/ci/pages.gitlab-ci.yml index 3247d7c4bce..5d13a72e224 100644 --- a/.gitlab/ci/pages.gitlab-ci.yml +++ b/.gitlab/ci/pages.gitlab-ci.yml @@ -9,13 +9,12 @@ pages: - master@gitlab-org/gitlab-ce - master@gitlab-org/gitlab-ee stage: pages - dependencies: ["coverage", "karma", "gitlab:assets:compile", "lint:javascript:report", "jsdoc"] + dependencies: ["coverage", "karma", "gitlab:assets:compile", "jsdoc"] script: - mv public/ .public/ - mkdir public/ - mv coverage/ public/coverage-ruby/ || true - mv coverage-javascript/ public/coverage-javascript/ || true - - mv eslint-report.html public/ || true - mv webpack-report/ public/webpack-report/ || true - cp .public/assets/application-*.css public/application.css || true - cp .public/assets/application-*.css.gz public/application.css.gz || true |