diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-11-23 07:09:05 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-11-23 07:09:05 +0000 |
| commit | 0676c5c7140ccf5b809eddab79b6fb78b7db0a66 (patch) | |
| tree | f80459eabf22eff192e790866f53f567ba082830 | |
| parent | d0c0c75ca9568bc3ec00c341a6053623d85e6201 (diff) | |
| parent | 459cd939e7a31c833858c86db6003327524800de (diff) | |
| download | gitlab-ce-0676c5c7140ccf5b809eddab79b6fb78b7db0a66.tar.gz | |
Merge branch 'eslint-html-report' into 'master'
Generate ESLint HTML report
## What does this MR do?
Generate a HTML report for the linting errors that ESLint discovered
(including files that contain `/* eslint-disable */`).
See merge request !7374
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 23 | ||||
| -rw-r--r-- | package.json | 3 |
3 files changed, 24 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 6a1002621f4..0b602d613c7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ .chef .directory /.envrc +eslint-report.html /.gitlab_shell_secret .idea /.rbenv-version diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab45ea57aed..2b65bc4182b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -349,7 +349,7 @@ coverage: - coverage/index.html - coverage/assets/ -lint-javascript: +lint:javascript: cache: paths: - node_modules/ @@ -358,7 +358,24 @@ lint-javascript: before_script: - npm install script: - - npm run eslint + - npm --silent run eslint + +lint:javascript:report: + cache: + paths: + - node_modules/ + stage: post-test + image: "node:7.1" + before_script: + - npm install + script: + - find app/ spec/ -name '*.js' -or -name '*.js.es6' -exec sed --in-place 's|/\* eslint-disable .*\*/||' {} \; # run report over all files + - npm --silent run eslint-report || true # ignore exit code + artifacts: + name: eslint-report + expire_in: 31d + paths: + - eslint-report.html # Trigger docs build # https://gitlab.com/gitlab-com/doc-gitlab-com/blob/master/README.md#deployment-process @@ -398,11 +415,13 @@ pages: dependencies: - coverage - teaspoon + - lint:javascript:report script: - mv public/ .public/ - mkdir public/ - mv coverage public/coverage-ruby - mv coverage-javascript/default/ public/coverage-javascript/ + - mv eslint-report.html public/ artifacts: paths: - public diff --git a/package.json b/package.json index 3d0e21b9848..350e4cd80c9 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,8 @@ "private": true, "scripts": { "eslint": "eslint --ext .js,.js.es6 .", - "eslint-fix": "eslint --fix --ext .js,.js.es6 ." + "eslint-fix": "npm run eslint -- --fix", + "eslint-report": "npm run eslint -- --format html --output-file ./eslint-report.html" }, "devDependencies": { "eslint": "^3.1.1", |