diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87601aad4..22e6e815c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -142,7 +142,7 @@ eslint: stage: review script: - export NODE_PATH=$(npm root -g) - - ./.gitlab-ci/run-eslint --output-file ${LINT_LOG} --format junit + - ./.gitlab-ci/run-eslint --output-file ${LINT_LOG} --format junit --stdout artifacts: reports: junit: ${LINT_LOG} @@ -155,7 +155,7 @@ eslint_mr: stage: review script: - export NODE_PATH=$(npm root -g) - - ./.gitlab-ci/run-eslint --output-file ${LINT_MR_LOG} --format junit + - ./.gitlab-ci/run-eslint --output-file ${LINT_MR_LOG} --format junit --stdout --remote ${CI_MERGE_REQUEST_PROJECT_URL}.git --branch ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME} only: diff --git a/.gitlab-ci/run-eslint b/.gitlab-ci/run-eslint index 0d9fcf456..5d0e41c8e 100755 --- a/.gitlab-ci/run-eslint +++ b/.gitlab-ci/run-eslint @@ -81,6 +81,10 @@ async function getMergeRequestChanges(remote, branch) { return report; } +function hasOption(...names) { + return process.argv.some(arg => names.includes(arg)); +} + function getOption(...names) { const optIndex = process.argv.findIndex(arg => names.includes(arg)) + 1; @@ -120,6 +124,11 @@ function getOption(...names) { if (outputPath) { fs.mkdirSync(path.dirname(outputPath), { recursive: true }); fs.writeFileSync(outputPath, resultText); + + if (hasOption('--stdout')) { + const consoleFormatter = await regular.loadFormatter(); + console.log(consoleFormatter.format(commonResults)); + } } else { console.log(resultText); }