aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNick Merwin <[email protected]>2020-04-24 15:36:58 -0700
committerGitHub <[email protected]>2020-04-24 15:36:58 -0700
commit705c3b5963e3cc76f8e70381dbae20979008c9b8 (patch)
treece6d30b9464784780bd701faae511f7fbaad8a57 /lib
parenteb6dc35294715ef07639eb93e6961861d05a1f67 (diff)
downloadnode-coveralls-705c3b5963e3cc76f8e70381dbae20979008c9b8.tar.xz
node-coveralls-705c3b5963e3cc76f8e70381dbae20979008c9b8.zip
Handle service_job_number for parallelism in Travis and CircleCI (#290)
* support `service_job_number` for CircleCI/Travis * Travis use TRAVIS_JOB_ID
Diffstat (limited to 'lib')
-rw-r--r--lib/convertLcovToCoveralls.js4
-rw-r--r--lib/getOptions.js8
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/convertLcovToCoveralls.js b/lib/convertLcovToCoveralls.js
index 416b3b4..bcbb993 100644
--- a/lib/convertLcovToCoveralls.js
+++ b/lib/convertLcovToCoveralls.js
@@ -92,6 +92,10 @@ const convertLcovToCoveralls = (input, options, cb) => {
postJson.service_job_id = options.service_job_id;
}
+ if (options.service_job_number) {
+ postJson.service_job_number = options.service_job_number;
+ }
+
if (options.service_pull_request) {
postJson.service_pull_request = options.service_pull_request;
}
diff --git a/lib/getOptions.js b/lib/getOptions.js
index 2f9c9fb..3ac5579 100644
--- a/lib/getOptions.js
+++ b/lib/getOptions.js
@@ -24,6 +24,7 @@ const getBaseOptions = cb => {
if (process.env.TRAVIS) {
options.service_name = 'travis-ci';
+ options.service_number = process.env.TRAVIS_BUILD_NUMBER;
options.service_job_id = process.env.TRAVIS_JOB_ID;
options.service_pull_request = process.env.TRAVIS_PULL_REQUEST;
git_commit = 'HEAD';
@@ -53,7 +54,8 @@ const getBaseOptions = cb => {
if (process.env.CIRCLECI) {
options.service_name = 'circleci';
- options.service_job_id = process.env.CIRCLE_BUILD_NUM;
+ options.service_number = process.env.CIRCLE_WORKFLOW_ID;
+ options.service_job_number = process.env.CIRCLE_BUILD_NUM;
if (process.env.CI_PULL_REQUEST) {
const pr = process.env.CI_PULL_REQUEST.split('/pull/');
@@ -147,6 +149,10 @@ const getBaseOptions = cb => {
options.service_number = process.env.COVERALLS_SERVICE_NUMBER;
}
+ if (process.env.COVERALLS_SERVICE_JOB_NUMBER) {
+ options.service_job_number = process.env.COVERALLS_SERVICE_JOB_NUMBER;
+ }
+
if (process.env.COVERALLS_SERVICE_JOB_ID) {
options.service_job_id = process.env.COVERALLS_SERVICE_JOB_ID;
}