Skip to content

Commit

Permalink
fix bad merge of karma.conf.js
Browse files Browse the repository at this point in the history
  • Loading branch information
boneskull committed Aug 1, 2016
1 parent 2f9a409 commit 16762d1
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,24 @@ module.exports = function(config) {
console.error('CI mode enabled');
if (env.TRAVIS) {
console.error('Travis-CI detected');
bundleDirpath = path.join(baseBundleDirpath, process.env.TRAVIS_BUILD_ID);
if (env.SAUCE_USERNAME && env.SAUCE_ACCESS_KEY) {
// correlate build/tunnel with Travis
sauceConfig = {
build: 'TRAVIS #' + env.TRAVIS_BUILD_NUMBER
+ ' (' + env.TRAVIS_BUILD_ID + ')',
tunnelIdentifier: env.TRAVIS_JOB_NUMBER
};
console.error('Configured SauceLabs')
console.error('Configured SauceLabs');
} else {
console.error('No SauceLabs credentials present');
}
} else if (env.APPVEYOR) {
console.error('AppVeyor detected');
bundleDirpath = path.join(baseBundleDirpath, process.env.APPVEYOR_BUILD_ID);
} else {
console.error('Local/unknown environment detected')
console.error('Local/unknown environment detected');
bundleDirpath = path.join(baseBundleDirpath, 'local');
// don't need to run sauce from appveyor b/c travis does it.
if (!(env.SAUCE_USERNAME || env.SAUCE_ACCESS_KEY)) {
console.error('No SauceLabs credentials present');
Expand All @@ -85,6 +88,7 @@ module.exports = function(config) {
console.error('Configured SauceLabs');
}
}
mkdirp.sync(bundleDirpath);
} else {
console.error('CI mode disabled');
}
Expand Down

0 comments on commit 16762d1

Please sign in to comment.