Temp

kravets-levko · kravets-levko · commit a0181ad72db0 · 2024-01-23T17:02:20.000+02:00
Signed-off-by: Levko Kravets &lt;levko.ne@gmail.com&gt;
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -39,6 +39,7 @@ jobs:
         node-version: ['16', '18', '20']
     env:
       cache-name: cache-node-modules
+      NYC_REPORT_DIR: coverage_unit_node${{ matrix.node-version }}
 
     steps:
       - uses: actions/setup-node@v4
@@ -58,12 +59,12 @@ jobs:
         run: |
           npm ci
           npm run test
-      - run: tar -cvf coverage_unit.tar coverage_unit
+      - run: tar -cvf ${{ env.NYC_REPORT_DIR }}.tar ${{ env.NYC_REPORT_DIR }}
       - name: Store coverage report
         uses: actions/upload-artifact@v3
         with:
-          name: coverage_unit
-          path: coverage_unit.tar
+          name: ${{ env.NYC_REPORT_DIR }}
+          path: ${{ env.NYC_REPORT_DIR }}.tar
           retention-days: 1
 
   e2e-test:
@@ -75,6 +76,7 @@ jobs:
       E2E_ACCESS_TOKEN: ${{ secrets.DATABRICKS_TOKEN }}
       E2E_TABLE_SUFFIX: ${{github.sha}}
       cache-name: cache-node-modules
+      NYC_REPORT_DIR: coverage_e2e
 
     steps:
       - uses: actions/checkout@v3
@@ -91,12 +93,12 @@ jobs:
         run: |
           npm ci
           NODE_OPTIONS="--max-old-space-size=4096" npm run e2e
-      - run: tar -cvf coverage_e2e.tar coverage_e2e
+      - run: tar -cvf ${{ env.NYC_REPORT_DIR }}.tar ${{ env.NYC_REPORT_DIR }}
       - name: Store coverage report
         uses: actions/upload-artifact@v3
         with:
-          name: coverage_e2e
-          path: coverage_e2e.tar
+          name: ${{ env.NYC_REPORT_DIR }}
+          path: ${{ env.NYC_REPORT_DIR }}.tar
           retention-days: 1
 
   coverage:
@@ -118,15 +120,14 @@ jobs:
             ${{ runner.os }}-
       - uses: actions/download-artifact@v3
         with:
-          name: coverage_unit
-      - uses: actions/download-artifact@v3
-        with:
-          name: coverage_e2e
-      - run: tar -xvf coverage_unit.tar && rm coverage_unit.tar
-      - run: tar -xvf coverage_e2e.tar && rm coverage_e2e.tar
-      - name: Coverage
-        uses: codecov/codecov-action@v3
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: true
-          verbose: true
+          pattern: coverage_*
+          merge-multiple: true
+      - run: ls -la coverage_e2e
+#      - run: tar -xvf coverage_unit.tar && rm coverage_unit.tar
+#      - run: tar -xvf coverage_e2e.tar && rm coverage_e2e.tar
+#      - name: Coverage
+#        uses: codecov/codecov-action@v3
+#        with:
+#          token: ${{ secrets.CODECOV_TOKEN }}
+#          fail_ci_if_error: true
+#          verbose: true
diff --git a/package.json b/package.json
@@ -13,8 +13,8 @@
   },
   "scripts": {
     "prepare": "npm run build",
-    "e2e": "nyc --reporter=lcov --report-dir=coverage_e2e mocha --config tests/e2e/.mocharc.js",
-    "test": "nyc --reporter=lcov --report-dir=coverage_unit mocha  --config tests/unit/.mocharc.js",
+    "e2e": "nyc --reporter=lcov --report-dir=${NYC_REPORT_DIR:-coverage_e2e} mocha --config tests/e2e/.mocharc.js",
+    "test": "nyc --reporter=lcov --report-dir=${NYC_REPORT_DIR:-coverage_unit} mocha  --config tests/unit/.mocharc.js",
     "update-version": "node bin/update-version.js && prettier --write ./lib/version.ts",
     "build": "npm run update-version && tsc",
     "watch": "tsc -w",
