diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52e60764d..195bb8a6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ stages: variables: BUNDLE: "extensions-git.flatpak" JS_LOG: "js-report.txt" - LINT_LOG: "eslint-report.txt" + LINT_LOG: "eslint-report.xml" .only_default: &only_default only: @@ -44,11 +44,11 @@ eslint: stage: review script: - export NODE_PATH=$(npm root -g) - - ./.gitlab-ci/run-eslint --output-file ${LINT_LOG} + - ./.gitlab-ci/run-eslint --output-file ${LINT_LOG} --format junit <<: *only_default artifacts: - paths: - - ${LINT_LOG} + reports: + junit: ${LINT_LOG} when: always potfile_check: diff --git a/.gitlab-ci/run-eslint b/.gitlab-ci/run-eslint index 68a664109..2a8f60d39 100755 --- a/.gitlab-ci/run-eslint +++ b/.gitlab-ci/run-eslint @@ -111,7 +111,7 @@ function getOption(...names) { const results = await Promise.all(ops); const commonResults = createCommon(...results, branch !== undefined); - const formatter = await regular.loadFormatter(); + const formatter = await regular.loadFormatter(getOption('--format', '-f')); const resultText = formatter.format(commonResults); if (outputPath) {