Skip to content

Commit 16762d1

Browse files
committed
fix bad merge of karma.conf.js
1 parent 2f9a409 commit 16762d1

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

karma.conf.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,24 @@ module.exports = function(config) {
6060
console.error('CI mode enabled');
6161
if (env.TRAVIS) {
6262
console.error('Travis-CI detected');
63+
bundleDirpath = path.join(baseBundleDirpath, process.env.TRAVIS_BUILD_ID);
6364
if (env.SAUCE_USERNAME && env.SAUCE_ACCESS_KEY) {
6465
// correlate build/tunnel with Travis
6566
sauceConfig = {
6667
build: 'TRAVIS #' + env.TRAVIS_BUILD_NUMBER
6768
+ ' (' + env.TRAVIS_BUILD_ID + ')',
6869
tunnelIdentifier: env.TRAVIS_JOB_NUMBER
6970
};
70-
console.error('Configured SauceLabs')
71+
console.error('Configured SauceLabs');
7172
} else {
7273
console.error('No SauceLabs credentials present');
7374
}
7475
} else if (env.APPVEYOR) {
7576
console.error('AppVeyor detected');
77+
bundleDirpath = path.join(baseBundleDirpath, process.env.APPVEYOR_BUILD_ID);
7678
} else {
77-
console.error('Local/unknown environment detected')
79+
console.error('Local/unknown environment detected');
80+
bundleDirpath = path.join(baseBundleDirpath, 'local');
7881
// don't need to run sauce from appveyor b/c travis does it.
7982
if (!(env.SAUCE_USERNAME || env.SAUCE_ACCESS_KEY)) {
8083
console.error('No SauceLabs credentials present');
@@ -85,6 +88,7 @@ module.exports = function(config) {
8588
console.error('Configured SauceLabs');
8689
}
8790
}
91+
mkdirp.sync(bundleDirpath);
8892
} else {
8993
console.error('CI mode disabled');
9094
}

0 commit comments

Comments
 (0)