Merge branch 'master' into fix/ts-check

Author: drazisil-codecov

.circleci/config.yml

@@ -26,14 +26,14 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v1-dependencies-{{ checksum "npm-shrinkwrap.json" }}
+            - v2-dependencies-{{ checksum "npm-shrinkwrap.json" }}
 
       - run: npm install
 
       - save_cache:
           paths:
             - node_modules
-          key: v1-dependencies-{{ checksum "npm-shrinkwrap.json" }}
+          key: v2-dependencies-{{ checksum "npm-shrinkwrap.json" }}
 
       # run tests!
       - run: make test
@@ -133,7 +133,7 @@ jobs:
       - run:
           name: Run Alpine binary -f (dry run)
           command: |
-            out/codecov-alpine -f /root/project/coverage-alpine/cobertura-coverage.xml -F alpine -d -Z -e CIRCLE_BRANCH >> output_alpine.txt
+            NODE_DEBUG=vm out/codecov-alpine -f /root/project/coverage-alpine/cobertura-coverage.xml -F alpine -d -Z -e CIRCLE_BRANCH >> output_alpine.txt
       - run:
           name: Run Alpine binary auto-detect (dry run)
           command: |
@@ -143,6 +143,9 @@ jobs:
           command: |
             out/codecov-alpine -F alpine -Z -e CIRCLE_BRANCH
 
+      - store_artifacts:
+          path: output_alpine.txt
+
       - persist_to_workspace:
           root: .
           paths:
@@ -181,7 +184,7 @@ jobs:
       - run:
           name: Run Linux binary -f (dry run)
           command: |
-            out/codecov-linux -f /home/circleci/project/coverage/cobertura-coverage.xml -F linux -d -Z -e CIRCLE_BRANCH >> output_linux.txt
+            out/codecov-linux -f /home/circleci/project/coverage/cobertura-coverage.xml -F linux -d -Z -v -e CIRCLE_BRANCH >> output_linux.txt
       - run:
           name: Run Linux binary auto-detect (dry run)
           command: |
@@ -232,7 +235,7 @@ jobs:
       - run:
           name: Run MacOS binary -f (dry-run)
           command: |
-            out/codecov-macos -f /Users/distiller/project/coverage/cobertura-coverage.xml -F macos -d -Z -e CIRCLE_BRANCH >> output_osx.txt
+            out/codecov-macos -f /Users/distiller/project/coverage/cobertura-coverage.xml -F macos -d -Z -v -e CIRCLE_BRANCH >> output_osx.txt
       - run:
           name: Run MacOS binary auto-detect (dry-run)
           command: |
@@ -282,7 +285,7 @@ jobs:
           command: |
             dir C:\Users\circleci\project\coverage\
             attrib C:\Users\circleci\project\coverage\cobertura-coverage.xml
-            .\out\codecov.exe -f C:\Users\circleci\project\coverage\cobertura-coverage.xml -F windows -d -Z -e CIRCLE_BRANCH >> output_win.txt
+            .\out\codecov.exe -f C:\Users\circleci\project\coverage\cobertura-coverage.xml -F windows -d -Z -v -e CIRCLE_BRANCH >> output_win.txt
           shell: cmd.exe
       - run:
           name: Run Windows binary auto-detect (dry-run)

bin/codecov

@@ -106,7 +106,7 @@ var argv = require('yargs') // eslint-disable-line
       alias: 'Q',
       type: 'string',
       description: `Used internally by Codecov, this argument helps track wrappers
-        of the uploader (e.g. GitHub Action, CircleCI Orb)`
+        of the uploader (e.g. GitHub Action, CircleCI Orb)`,
     },
   })
   .version()

npm-shrinkwrap.json

@@ -45,7 +45,7 @@
     "eslint-config-prettier": "8.3.0",
     "husky": "7.0.1",
     "jest": "27.0.6",
-    "lint-staged": "11.0.1",
+    "lint-staged": "11.1.0",
     "nock": "13.1.1",
     "pkg": "5.1.0",
     "prettier": "2.3.2",

package.json

@@ -1,5 +1,5 @@
 const childProcess = require('child_process')
-const { log } = require('../helpers/logger')
+const { error, info, verbose } = require('../helpers/logger')
 
 function detect(envs) {
   return !!envs.SYSTEM_TEAMFOUNDATIONSERVERURI
@@ -63,7 +63,7 @@ function _getSHA(inputs) {
       .trimRight()
     if (mergeCommitRegex.exec(mergeCommitMessage)) {
       const mergeCommit = mergeCommitMessage.split(' ')[1]
-      log(`    Fixing merge commit SHA ${commit} -> ${mergeCommit}`)
+      info(`    Fixing merge commit SHA ${commit} -> ${mergeCommit}`)
       commit = mergeCommit
     }
   }

src/ci_providers/provider_azurepipelines.js

@@ -1,5 +1,5 @@
 const childProcess = require('child_process')
-const { log } = require('../helpers/logger')
+const { error, info, verbose } = require('../helpers/logger')
 
 function detect(envs) {
   return envs.GITHUB_ACTIONS
@@ -70,10 +70,10 @@ function _getSHA(inputs) {
       .trimRight()
     if (mergeCommitRegex.exec(mergeCommitMessage)) {
       const mergeCommit = mergeCommitMessage.split(' ')[1]
-      log(`    Fixing merge commit SHA ${commit} -> ${mergeCommit}`)
+      info(`    Fixing merge commit SHA ${commit} -> ${mergeCommit}`)
       commit = mergeCommit
     } else if (mergeCommitMessage === '') {
-      log(
+      info(
         '->  Issue detecting commit SHA. Please run actions/checkout with fetch-depth > 1 or set to 0',
       )
     }

src/ci_providers/provider_githubactions.js

@@ -1,5 +1,6 @@
 const childprocess = require('child_process')
 const { parseSlug } = require('../helpers/git')
+const { logAndThrow } = require('../helpers/util')
 
 function detect(envs) {
   return !envs.CI
@@ -27,9 +28,7 @@ function _getBranch(inputs) {
       .trimRight()
     return branchName
   } catch (error) {
-    throw new Error(
-      `There was an error getting the branch name from git: ${error}`,
-    )
+    logAndThrow(`There was an error getting the branch name from git: ${error}`)
   }
 }
 
@@ -66,9 +65,7 @@ function _getSHA(inputs) {
       .trimRight()
     return sha
   } catch (error) {
-    throw new Error(
-      `There was an error getting the commit SHA from git: ${error}`,
-    )
+    logAndThrow(`There was an error getting the commit SHA from git: ${error}`)
   }
 }
 
@@ -84,7 +81,7 @@ function _getSlug(inputs) {
       .trimRight()
     return parseSlug(slug)
   } catch (error) {
-    throw new Error(`There was an error getting the slug from git: ${error}`)
+    logAndThrow(`There was an error getting the slug from git: ${error}`)
   }
 }