Skip to content

brainfood / videojs-contrib-hls

Go to a project
Toggle navigation
Toggle navigation pinning
05686071 by David LaPalomento
Options

Merge pull request #57 from videojs/the-phantom-of-the-karma 

Only run saucelabs if PR initiated in main repo
2 parents d828f47e 04ecb931
Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
...@@ -3,8 +3,7 @@ node_js: ...@@ -3,8 +3,7 @@ node_js:
3 - '0.10' 3 - '0.10'
4 before_script: 4 before_script:
5 - npm install -g grunt-cli 5 - npm install -g grunt-cli
6 - curl https://gist.githubusercontent.com/santiycr/5139565/raw/sauce_connect_setup.sh 6 - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then curl https://gist.githubusercontent.com/santiycr/5139565/raw/sauce_connect_setup.sh | bash; fi
7 | bash
8 notifications: 7 notifications:
9 hipchat: 8 hipchat:
10 rooms: 9 rooms:
......
...@@ -270,7 +270,9 @@ module.exports = function(grunt) { ...@@ -270,7 +270,9 @@ module.exports = function(grunt) {
270 270
271 grunt.task.run(['jshint', 'manifests-to-js']); 271 grunt.task.run(['jshint', 'manifests-to-js']);
272 272
273 if (process.env.TRAVIS) { 273 if (process.env.TRAVIS_PULL_REQUEST) {
274 grunt.task.run(['karma:phantomjs']);
275 } else if (process.env.TRAVIS) {
274 grunt.task.run(['karma:saucelabs']); 276 grunt.task.run(['karma:saucelabs']);
275 } else { 277 } else {
276 if (tasks.length === 0) { 278 if (tasks.length === 0) {
......