Merge pull request #4389 from JoeRobich/fix-codecov-report

Fix code coverage reporting in PR CI.

Author: JoeRobich

.github/workflows/ci.yml

@@ -28,22 +28,33 @@ jobs:
         node-version: '12.x'
 
     - name: Install dependencies
-      run: npm ci && npm i -g gulp
+      run: |
+          npm ci
+          npm i -g gulp
 
-    - name: Build
+    - name: Build extension package
       run: gulp 'vsix:release:package'
 
-    - name: Initialize code coverage
-      run: gulp cov:instrument
-
     - name: Run unit and integration tests
-      run: gulp test
+      run: |
+          gulp cov:instrument
+          gulp test
+          gulp cov:merge
+          npm run test:artifacts
       env:
         CODE_VERSION: 1.45.0
         DISPLAY: :99.0
 
-    - name: Report code coverage
-      run: gulp cov:report
+    - name: Report unit test coverage
+      uses: codecov/codecov-action@v1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: ./coverage/unit/lcov.info
+        flags: unit
 
-    - name: Run artifact tests
-      run: npm run test:artifacts
+    - name: Report integration test coverage
+      uses: codecov/codecov-action@v1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: ./coverage/integration/lcov.info
+        flags: integration

.github/workflows/release-ci.yml

@@ -17,9 +17,11 @@ jobs:
         node-version: '12.x'
 
     - name: Install dependencies
-      run: npm ci && npm i -g gulp
+      run: |
+          npm ci
+          npm i -g gulp
 
-    - name: Build
+    - name: Build extension package
       run: gulp 'vsix:release:package'
 
     - name: Run release tests
@@ -37,4 +39,4 @@ jobs:
         upload_url: ${{ github.event.release.upload_url }}
         asset_path: ./csharp-${{ env.VERSION }}.vsix
         asset_name: csharp-${{ env.VERSION }}.vsix
-        asset_content_type: application/zip  
+        asset_content_type: application/zip

package-lock.json

@@ -58,20 +58,7 @@
     "gulp": "gulp"
   },
   "nyc": {
-    "include": [
-      "src/**/*.ts",
-      "src/**/*.tsx"
-    ],
-    "extension": [
-      ".ts",
-      ".tsx"
-    ],
-    "require": [
-      "ts-node/register",
-      "source-map-support/register"
-    ],
-    "sourceMap": true,
-    "instrument": true
+    "extends": "@istanbuljs/nyc-config-typescript"
   },
   "dependencies": {
     "async-file": "2.0.2",
@@ -96,6 +83,7 @@
     "yauzl": "2.10.0"
   },
   "devDependencies": {
+    "@istanbuljs/nyc-config-typescript": "1.0.1",
     "@types/archiver": "2.1.2",
     "@types/chai": "4.1.7",
     "@types/chai-arrays": "1.0.2",
@@ -141,7 +129,7 @@
     "mock-http-server": "0.2.0",
     "natives": "1.1.6",
     "npm-run-all": "4.1.5",
-    "nyc": "^15.0.0",
+    "nyc": "15.0.1",
     "plist": "3.0.1",
     "remap-istanbul": "0.13.0",
     "source-map-support": "0.5.10",