Skip to content

Commit a431ac2

Browse files
authored
re-enable codecov (#1256)
1 parent 1d2e50a commit a431ac2

File tree

2 files changed

+98
-3
lines changed

2 files changed

+98
-3
lines changed

.circleci/config.yml

Lines changed: 95 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,15 @@ node-core-base: &node-core-base
3333
run:
3434
name: Unit tests
3535
command: yarn test:core:ci
36+
- run:
37+
name: Merge coverage report
38+
command: yarn cover:merge
3639
- store_artifacts:
37-
path: ./coverage/lcov-report
40+
path: ./coverage
41+
- persist_to_workspace:
42+
root: ~/dd-trace-js
43+
paths:
44+
- .nyc_merge/*
3845

3946
node-bench-base: &node-bench-base
4047
resource_class: small
@@ -111,8 +118,15 @@ node-plugin-base: &node-plugin-base
111118
- run:
112119
name: Unit tests
113120
command: yarn test:plugins:ci
121+
- run:
122+
name: Merge coverage report
123+
command: yarn cover:merge
114124
- store_artifacts:
115-
path: ./coverage/lcov-report
125+
path: ./coverage
126+
- persist_to_workspace:
127+
root: ~/dd-trace-js
128+
paths:
129+
- .nyc_merge/*
116130

117131
prebuild-linux-base: &prebuild-linux-base
118132
docker:
@@ -774,6 +788,28 @@ jobs:
774788
- store_artifacts:
775789
path: ./docs/out
776790

791+
# Code coverage
792+
793+
codecov:
794+
docker:
795+
- image: node
796+
working_directory: ~/dd-trace-js
797+
resource_class: small
798+
steps:
799+
- checkout
800+
- *yarn-versions
801+
- *restore-yarn-cache
802+
- *yarn-install
803+
- *save-yarn-cache
804+
- attach_workspace:
805+
at: ~/dd-trace-js
806+
- run:
807+
name: Build code coverage report
808+
command: yarn cover:report
809+
- run:
810+
name: Submit code coverage report
811+
command: yarn codecov
812+
777813
# Prebuilds (linux x64)
778814

779815
linux-x64-15:
@@ -1105,6 +1141,63 @@ workflows:
11051141
- node-tedious
11061142
- node-when
11071143
- node-winston
1144+
- codecov:
1145+
requires:
1146+
- node-core-8
1147+
- node-core-10
1148+
- node-core-12
1149+
- node-core-14
1150+
- node-core-15
1151+
- node-core-latest
1152+
- node-amqplib
1153+
- node-amqp10
1154+
- node-aws-sdk
1155+
- node-bluebird
1156+
- node-bunyan
1157+
- node-cassandra
1158+
- node-connect
1159+
- node-couchbase
1160+
- node-dns
1161+
- node-elasticsearch
1162+
- node-express
1163+
- node-fastify
1164+
- node-fs-8
1165+
- node-fs-10
1166+
- node-fs-12
1167+
- node-fs-14
1168+
- node-fs-15
1169+
- node-fs-latest
1170+
- node-generic-pool
1171+
- node-google-cloud-pubsub
1172+
- node-graphql
1173+
- node-grpc
1174+
- node-hapi
1175+
- node-http
1176+
- node-http2
1177+
- node-jest
1178+
- node-kafkajs
1179+
- node-knex
1180+
- node-koa
1181+
# - node-limitd-client
1182+
- node-memcached
1183+
- node-microgateway-core
1184+
- node-mocha
1185+
- node-mongodb-core
1186+
- node-mongoose
1187+
- node-mysql
1188+
- node-net
1189+
- node-paperplane
1190+
- node-pino
1191+
- node-postgres
1192+
- node-promise-js
1193+
- node-promise
1194+
- node-q
1195+
- node-redis
1196+
- node-restify
1197+
- node-router
1198+
- node-tedious
1199+
- node-when
1200+
- node-winston
11081201
prebuild:
11091202
jobs:
11101203
# Linux x64

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
"test:integration": "mocha --timeout 30000 \"integration-tests/**/*.spec.js\"",
2929
"leak:core": "node ./scripts/install_plugin_modules && (cd packages/memwatch && yarn) && NODE_PATH=./packages/memwatch/node_modules node --no-warnings ./node_modules/.bin/tape 'packages/dd-trace/test/leak/**/*.js'",
3030
"leak:plugins": "yarn services && (cd packages/memwatch && yarn) && NODE_PATH=./packages/memwatch/node_modules node --no-warnings ./node_modules/.bin/tape \"packages/datadog-plugin-@($(echo $PLUGINS))/test/leak.js\"",
31+
"cover:merge": "nyc merge ./.nyc_output ./.nyc_merge/$CIRCLE_JOB.json",
32+
"cover:report": "nyc report -t ./.nyc_merge -n 'packages/**/*.js'",
3133
"codecov": "codecov"
3234
},
3335
"repository": {
@@ -85,7 +87,7 @@
8587
"body-parser": "^1.18.2",
8688
"chai": "^4.2.0",
8789
"checksum": "^0.1.1",
88-
"codecov": "3.5.0",
90+
"codecov": "^3.8.1",
8991
"dotenv": "^8.2.0",
9092
"eslint": "^4.15.0",
9193
"eslint-config-standard": "^11.0.0-beta.0",

0 commit comments

Comments
 (0)