Skip to content

Commit

Permalink
Merge pull request #4 from dharma-eng/merge-coverage-take-4
Browse files Browse the repository at this point in the history
just combine the lcov files manually
  • Loading branch information
0age authored May 26, 2020
2 parents efd2408 + b5929e8 commit 8d4b7e2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"test:app": "yarn build:sol && NODE_ENV=all yarn mocha:ts -- \"./test/tests/**/*.spec.ts\"",
"test:coverage:sol": "yarn build:ts:tests && NODE_ENV=coverage ./node_modules/.bin/truffle run coverage --file=\"test/tests/BlockchainCoverage.spec.js\" && rm -rf ./dist-test",
"test:coverage:app": "nyc yarn test:app",
"test:coverage": "yarn test:coverage:app && yarn test:coverage:sol && cp ./coverage/lcov.info ./coverage/app/lcov.info && ./node_modules/.bin/lcov-result-merger ./coverage/*/lcov.info ./coverage/lcov.info",
"test:coverage": "yarn test:coverage:app && yarn test:coverage:sol && mv ./coverage/lcov.info ./coverage/app/lcov.info && cat coverage/app/lcov.info coverage/sol/lcov.info > coverage/lcov.info",
"test": "yarn test:app && yarn test:coverage",
"report-coverage": "cat ./coverage/lcov.info | coveralls",
"prettier": "prettier --write",
Expand All @@ -53,7 +53,6 @@
"ethereumjs-utils": "^5.2.5",
"ethlint": "^1.2.5",
"keccak256": "^1.0.0",
"lcov-result-merger": "^3.1.0",
"level": "^6.0.1",
"level-ws": "^2.0.0",
"leveldown": "^5.6.0",
Expand Down
13 changes: 2 additions & 11 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6614,15 +6614,6 @@ lcov-parse@^1.0.0:
resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-1.0.0.tgz#eb0d46b54111ebc561acb4c408ef9363bdc8f7e0"
integrity sha1-6w1GtUER68VhrLTECO+TY73I9+A=

lcov-result-merger@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/lcov-result-merger/-/lcov-result-merger-3.1.0.tgz#ae6d1be663dbf7d586d8004642359d39de72039e"
integrity sha512-vGXaMNGZRr4cYvW+xMVg+rg7qd5DX9SbGXl+0S3k85+gRZVK4K7UvxPWzKb/qiMwe+4bx3EOrW2o4mbdb1WnsA==
dependencies:
through2 "^2.0.3"
vinyl "^2.1.0"
vinyl-fs "^3.0.2"

lead@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/lead/-/lead-1.0.0.tgz#6f14f99a37be3a9dd784f5495690e5903466ee42"
Expand Down Expand Up @@ -10703,7 +10694,7 @@ verror@1.10.0:
core-util-is "1.0.2"
extsprintf "^1.2.0"

vinyl-fs@^3.0.0, vinyl-fs@^3.0.2:
vinyl-fs@^3.0.0:
version "3.0.3"
resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-3.0.3.tgz#c85849405f67428feabbbd5c5dbdd64f47d31bc7"
integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==
Expand Down Expand Up @@ -10739,7 +10730,7 @@ vinyl-sourcemap@^1.1.0:
remove-bom-buffer "^3.0.0"
vinyl "^2.0.0"

vinyl@^2.0.0, vinyl@^2.1.0:
vinyl@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
Expand Down

0 comments on commit 8d4b7e2

Please sign in to comment.