Skip to content

Commit

Permalink
Merge pull request #151 from jakemmarsh/fix-pr-ci
Browse files Browse the repository at this point in the history
require travis_pull_request to exist before running saucelabs
  • Loading branch information
jakemmarsh committed Feb 13, 2016
2 parents b2adf36 + b37c28a commit 69cc3c0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@ const ciAdditions = {
};

module.exports = function(config) {
const isCI = process.env.CI;
const isCI = process.env.CI && process.env.TRAVIS_PULL_REQUEST;
config.set(isCI ? Object.assign(karmaBaseConfig, ciAdditions) : karmaBaseConfig);
};

0 comments on commit 69cc3c0

Please sign in to comment.