ci(codecov): fix code coverage (#74)

BedrockStreaming · Mar 20, 2022 · b97828e · b97828e
1 parent 115e63a
commit b97828e
Show file tree

Hide file tree

Showing 9 changed files with 53 additions and 20 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,13 +25,13 @@ jobs:
       - run: yarn install --frozen-lockfile --non-interactive --no-progress --prefer-offline
       - run: npx nx affected --target=lint --parallel --max-parallel=3
       - run: npx nx affected --target=build --parallel --max-parallel=3
-      - run: npx nx affected --target=test --parallel --max-parallel=2
+      - run: npx nx affected --target=test --parallel --max-parallel=2 --code-coverage
       - run: npx nx affected --target=e2e --parallel --max-parallel=2
 
-      # - name: Codecov upload
-      #   uses: codecov/codecov-action@v2
-      #   with:
-      #     token: ${{ secrets.CODECOV_TOKEN }}
+      - name: Codecov upload
+        uses: codecov/codecov-action@v2
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   pr:
     runs-on: ubuntu-latest
@@ -54,11 +54,11 @@ jobs:
       - run: yarn install --frozen-lockfile --non-interactive --no-progress --prefer-offline
       - run: npx nx affected --base=origin/master --target=lint --parallel --max-parallel=3
       - run: npx nx affected --base=origin/master --target=build --parallel --max-parallel=3
-      - run: npx nx affected --base=origin/master --target=test --parallel --max-parallel=2 --coverage --outputFile=coverage-final.json --json
+      - run: npx nx affected --base=origin/master --target=test --parallel --max-parallel=2 --code-coverage
       - run: npx nx affected --base=origin/master --target=e2e --parallel --max-parallel=2
 
-      # - name: Codecov upload
-      #   uses: codecov/codecov-action@v2
-      #   with:
-      #     verbose: true
-      #     token: ${{ secrets.CODECOV_TOKEN }}
+      - name: Codecov upload
+        uses: codecov/codecov-action@v2
+        with:
+          verbose: true
+          token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -32,11 +32,11 @@ jobs:
       - name: Build
         run: yarn nx affected:build --base=last-release
       - name: Unit tests
-        run: yarn nx affected:test --base=last-release
-      # - name: Codecov upload
-      #   uses: codecov/codecov-action@v2
-      #   with:
-      #     token: ${{ secrets.CODECOV_TOKEN }}
+        run: yarn nx affected:test --base=last-release --code-coverage
+      - name: Codecov upload
+        uses: codecov/codecov-action@v2
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
 
   release:
     runs-on: ubuntu-latest

diff --git a/apps/demo/jest.config.js b/apps/demo/jest.config.js
@@ -7,4 +7,5 @@ module.exports = {
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/apps/demo',
+  coverageReporters: ['html', 'lcov'],
 };
diff --git a/codecov.yml b/codecov.yml
@@ -3,10 +3,22 @@ coverage:
   round: down
   status:
     project:
-      builder:
-        target: 70%
+      form-builder:
+        target: 90%
         flags:
-          - builder
+          - form-builder
+      form-redux:
+        target: 90%
+        flags:
+          - form-redux
+      form-context:
+        target: 90%
+        flags:
+          - form-context
+      form-validation-rule-list:
+        target: 90%
+        flags:
+          - form-validation-rule-list
     patch:
       default:
         enabled: no
@@ -16,6 +28,21 @@ coverage:
         enabled: no
         if_not_found: success
 flags:
-  builder:
+  form-builder:
     paths:
       - libs/form-builder/src
+  form-redux:
+    paths:
+      - libs/form-redux/src
+  form-context:
+    paths:
+      - libs/form-context/src
+  form-validation-rule-list:
+    paths:
+      - libs/form-validation-rule-list/src
+
+ignore:
+  - "apps/demo/**/*"
+  - "apps/docsite/**/*"
+  - "libs/form-editor/**/*"
+  - "libs/examples/**/*"
diff --git a/libs/form-builder/jest.config.js b/libs/form-builder/jest.config.js
@@ -6,4 +6,5 @@ module.exports = {
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/libs/form-builder',
+  coverageReporters: ['html', 'lcov'],
 };
diff --git a/libs/form-context/jest.config.js b/libs/form-context/jest.config.js
@@ -6,4 +6,5 @@ module.exports = {
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/libs/form-context',
+  coverageReporters: ['html', 'lcov'],
 };
diff --git a/libs/form-editor/jest.config.js b/libs/form-editor/jest.config.js
@@ -6,4 +6,5 @@ module.exports = {
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/libs/form-editor',
+  coverageReporters: ['html', 'lcov'],
 };
diff --git a/libs/form-redux/jest.config.js b/libs/form-redux/jest.config.js
@@ -11,4 +11,5 @@ module.exports = {
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/libs/form-redux',
+  coverageReporters: ['html', 'lcov'],
 };
diff --git a/libs/form-validation-rule-list/jest.config.js b/libs/form-validation-rule-list/jest.config.js
@@ -6,4 +6,5 @@ module.exports = {
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/libs/form-validation-rule-list',
+  coverageReporters: ['html', 'lcov'],
 };