From fc7ce34cdb2388eda63d7a6f1e9eac9319287ac8 Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> Date: Tue, 14 Jan 2025 08:49:46 +0530 Subject: [PATCH 1/6] fix: codecov coverage report merging --- .github/workflows/pull-request.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 26ad15f526..407e66ba92 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -251,6 +251,14 @@ jobs: run: | npm run test -- --watchAll=false --coverage + - name: Upload Jest Coverage to Codecov + if: steps.changed-files.outputs.only_changed != 'true' + uses: codecov/codecov-action@v3 + with: + files: ./coverage/jest/lcov.info + flags: jest + fail_ci_if_error: true + - name: Run Vitest Tests if: steps.changed-files.outputs.only_changed != 'true' env: @@ -258,14 +266,13 @@ jobs: run: | npm run test:vitest:coverage - - name: Merge Coverage Reports - if: steps.changed-files.outputs.only_changed != 'true' - run: | - mkdir -p coverage - if ! npx lcov-result-merger 'coverage/*/lcov.info' > 'coverage/lcov.info'; then - echo "Failed to merge coverage reports" - exit 1 - fi + - name: Upload Vitest Coverage to Codecov + if: steps.changed-files.outputs.any_changed == 'true' + uses: codecov/codecov-action@v3 + with: + files: ./coverage/vitest/lcov.info + flags: vitest + fail_ci_if_error: true - name: TypeScript compilation for changed files run: | From 38fcd66a249916574233a9a672e3f12ccfd28b17 Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> Date: Tue, 14 Jan 2025 08:58:01 +0530 Subject: [PATCH 2/6] fix: update to latest version Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- .github/workflows/pull-request.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 407e66ba92..aa04d36407 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -268,11 +268,12 @@ jobs: - name: Upload Vitest Coverage to Codecov if: steps.changed-files.outputs.any_changed == 'true' - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v4 with: + token: ${{ secrets.CODECOV_TOKEN }} files: ./coverage/vitest/lcov.info flags: vitest - fail_ci_if_error: true + fail_ci_if_error: true - name: TypeScript compilation for changed files run: | From d5fadde7c247f67528a8e5ca360a8804b8861c92 Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:06:33 +0530 Subject: [PATCH 3/6] refactor: remove redundant steps --- .github/workflows/pull-request.yml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index aa04d36407..fbc3844c07 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -245,22 +245,23 @@ jobs: uses: tj-actions/changed-files@v45 - name: Run Jest Tests - if: steps.changed-files.outputs.only_changed != 'true' + if: steps.changed-files.outputs.any_changed == 'true' env: NODE_V8_COVERAGE: './coverage/jest' run: | npm run test -- --watchAll=false --coverage - name: Upload Jest Coverage to Codecov - if: steps.changed-files.outputs.only_changed != 'true' - uses: codecov/codecov-action@v3 + if: steps.changed-files.outputs.any_changed == 'true' + uses: codecov/codecov-action@v4 with: + token: ${{ secrets.CODECOV_TOKEN }} files: ./coverage/jest/lcov.info flags: jest fail_ci_if_error: true - name: Run Vitest Tests - if: steps.changed-files.outputs.only_changed != 'true' + if: steps.changed-files.outputs.any_changed == 'true' env: NODE_V8_COVERAGE: './coverage/vitest' run: | @@ -283,16 +284,6 @@ jobs: fi done - - name: Present and Upload coverage to Codecov as ${{env.CODECOV_UNIQUE_NAME}} - uses: codecov/codecov-action@v4 - with: - token: ${{ secrets.CODECOV_TOKEN }} - verbose: true - gcov_ignore: 'docs/' - fail_ci_if_error: false - files: './coverage/lcov.info' - name: '${{env.CODECOV_UNIQUE_NAME}}' - - name: Test acceptable level of code coverage uses: VeryGoodOpenSource/very_good_coverage@v3 with: From 66a4529fc8e74eec8deb78411bceeb214a6085b6 Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:36:57 +0530 Subject: [PATCH 4/6] try alter approach --- .github/workflows/pull-request.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index fbc3844c07..8aefe5db78 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -275,6 +275,19 @@ jobs: files: ./coverage/vitest/lcov.info flags: vitest fail_ci_if_error: true + + - name: Merge Jest and Vitest Coverage Reports + run: | + mkdir -p ./coverage + npx lcov-result-merger './coverage/*/lcov.info' './coverage/lcov.info' + + - name: Upload Combined Coverage to Codecov + uses: codecov/codecov-action@v4 + with: + token: ${{ secrets.CODECOV_TOKEN }} + files: ./coverage/lcov.info + flags: combined + fail_ci_if_error: true - name: TypeScript compilation for changed files run: | From b2fee6347a5a5be6e55ab94039127d844b585774 Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> Date: Tue, 14 Jan 2025 09:58:55 +0530 Subject: [PATCH 5/6] refactor!: ignore docss/ --- .github/workflows/pull-request.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 8aefe5db78..8908a93b87 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -274,6 +274,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} files: ./coverage/vitest/lcov.info flags: vitest + gcov_ignore: 'docs/' fail_ci_if_error: true - name: Merge Jest and Vitest Coverage Reports @@ -287,6 +288,7 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} files: ./coverage/lcov.info flags: combined + gcov_ignore: 'docs/' fail_ci_if_error: true - name: TypeScript compilation for changed files @@ -301,7 +303,7 @@ jobs: uses: VeryGoodOpenSource/very_good_coverage@v3 with: path: "./coverage/lcov.info" - min_coverage: 0.0 + min_coverage: 90.0 # Graphql-Inspector: # if: ${{ github.actor != 'dependabot[bot]' }} From 9da9478ebfe2ca73c3f9762580360149852890ea Mon Sep 17 00:00:00 2001 From: Vamshi Maskuri <117595548+varshith257@users.noreply.github.com> Date: Tue, 14 Jan 2025 10:05:52 +0530 Subject: [PATCH 6/6] Update pull-request.yml --- .github/workflows/pull-request.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 8908a93b87..a6f0dc0b5f 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -274,7 +274,6 @@ jobs: token: ${{ secrets.CODECOV_TOKEN }} files: ./coverage/vitest/lcov.info flags: vitest - gcov_ignore: 'docs/' fail_ci_if_error: true - name: Merge Jest and Vitest Coverage Reports @@ -286,9 +285,9 @@ jobs: uses: codecov/codecov-action@v4 with: token: ${{ secrets.CODECOV_TOKEN }} + gcov_ignore: 'docs/' files: ./coverage/lcov.info flags: combined - gcov_ignore: 'docs/' fail_ci_if_error: true - name: TypeScript compilation for changed files @@ -303,7 +302,7 @@ jobs: uses: VeryGoodOpenSource/very_good_coverage@v3 with: path: "./coverage/lcov.info" - min_coverage: 90.0 + min_coverage: 0.0 # Graphql-Inspector: # if: ${{ github.actor != 'dependabot[bot]' }}