Skip to content

Commit 94941f3

Browse files
committed
fix(karma): ensure job number reflects CI environment
Fixes #111
1 parent 49b7062 commit 94941f3

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

karma.conf.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,38 @@
11
const packageJson = require('./package.json');
2+
/* eslint-disable no-process-env */
3+
let job = process.env.JOB_NUMBER || Date.now();
24
let browsers = [ 'ChromeHeadless' ];
35
let build = 'localbuild';
46
let branch = 'local';
5-
let job = Date.now();
67
let startConnect = false;
78
const reporters = [ 'progress', 'coverage' ];
89
const tags = [ `${ packageJson.name }@${ packageJson.version }` ];
910
const frameworks = [ 'mocha' ];
1011

11-
/* eslint-disable no-process-env */
1212
const debug = Boolean(process.env.npm_config_debug);
1313
if (process.env.SAUCE_ACCESS_KEY && process.env.SAUCE_USERNAME) {
1414
browsers = [ 'SauceEdgeLatest', 'SauceInternetExplorerTen', 'SauceSafariLatest' ];
1515
tags.push(`${ process.env.SAUCE_USERNAME }@${ branch }`);
1616
reporters.push('saucelabs');
17+
startConnect = true;
1718
} else if (process.env.APPVEYOR) {
1819
browsers = [ 'Firefox', 'ChromeHeadless', 'IE' ];
19-
branch = process.env.APPVEYOR_REPO_BRANCH;
20-
job = process.env.APPVEYOR_JOB_NUMBER;
21-
build = `appveyor@${ process.env.APPVEYOR_JOB_NUMBER }`;
2220
} else if (process.env.TRAVIS) {
2321
browsers = [ 'FirefoxHeadless', 'ChromeHeadless' ];
24-
branch = process.env.TRAVIS_BRANCH;
25-
job = process.env.TRAVIS_JOB_NUMBER;
26-
build = `travis@${ process.env.TRAVIS_JOB_NUMBER }`;
27-
startConnect = true;
2822
} else if (!process.env.KARMA_MANUAL) {
2923
browsers = [];
3024
frameworks.push('detectBrowsers');
3125
}
26+
27+
if (process.env.APPVEYOR) {
28+
branch = process.env.APPVEYOR_REPO_BRANCH;
29+
build = `appveyor@${ process.env.APPVEYOR_JOB_NUMBER }`;
30+
job = process.env.APPVEYOR_JOB_NUMBER;
31+
} else if (process.env.TRAVIS) {
32+
branch = process.env.TRAVIS_BRANCH;
33+
build = `travis@${ process.env.TRAVIS_JOB_NUMBER }`;
34+
job = process.env.TRAVIS_JOB_NUMBER;
35+
}
3236
/* eslint-enable */
3337

3438
tags.push(build);

0 commit comments

Comments
 (0)