From eea3f32eeb278fbb7581d98456c90804489fbb35 Mon Sep 17 00:00:00 2001 From: prayansh_chhablani Date: Tue, 26 Nov 2024 16:52:09 +0530 Subject: [PATCH] fixing merge report --- .github/workflows/pull-request.yml | 5 +++-- jest.config.js | 2 +- vitest.config.ts | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 71aaccfc4c..b9c80a9b62 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -202,7 +202,7 @@ jobs: - name: Run Jest Tests if: steps.changed-files.outputs.only_changed != 'true' env: - NODE_V8_COVERAGE: './.nyc_output' + NODE_V8_COVERAGE: './coverage/jest' run: | mkdir -p ./.nyc_output npm run test -- --watchAll=false --coverage @@ -210,13 +210,14 @@ jobs: - name: Run Vitest Tests if: steps.changed-files.outputs.only_changed != 'true' env: - NODE_V8_COVERAGE: './.nyc_output' + NODE_V8_COVERAGE: './coverage/vitest' run: | npm run test:vitest:coverage - name: Merge Coverage Reports if: steps.changed-files.outputs.only_changed != 'true' run: | + mkdir -p coverage npx lcov-result-merger 'coverage/*/lcov.info' > 'coverage/lcov.info' - name: TypeScript compilation for changed files diff --git a/jest.config.js b/jest.config.js index be4cced587..008cf43616 100644 --- a/jest.config.js +++ b/jest.config.js @@ -68,6 +68,6 @@ export default { '/build/', '/public/', ], - coverageDirectory: './.nyc_output', + coverageDirectory: './coverage/jest', coverageReporters: ['text', 'html', 'text-summary', 'lcov'], }; diff --git a/vitest.config.ts b/vitest.config.ts index db1e74fd97..cd08488b3c 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -18,7 +18,7 @@ export default defineConfig({ coverage: { enabled: true, provider: 'istanbul', - reportsDirectory: './.nyc_output', + reportsDirectory: './coverage/vitest', exclude: [ 'node_modules', 'dist',