Skip to content

Commit

Permalink
fixing merge report
Browse files Browse the repository at this point in the history
  • Loading branch information
prayanshchh committed Nov 26, 2024
1 parent 6214b2f commit eea3f32
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -202,21 +202,22 @@ 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
- 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
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,6 @@ export default {
'<rootDir>/build/',
'<rootDir>/public/',
],
coverageDirectory: './.nyc_output',
coverageDirectory: './coverage/jest',
coverageReporters: ['text', 'html', 'text-summary', 'lcov'],
};
2 changes: 1 addition & 1 deletion vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default defineConfig({
coverage: {
enabled: true,
provider: 'istanbul',
reportsDirectory: './.nyc_output',
reportsDirectory: './coverage/vitest',
exclude: [
'node_modules',
'dist',
Expand Down

0 comments on commit eea3f32

Please sign in to comment.